diff options
| author | Tanguy Leroux <tlrx.dev@gmail.com> | 2016-07-01 13:05:41 +0200 |
|---|---|---|
| committer | Tanguy Leroux <tlrx.dev@gmail.com> | 2016-07-01 17:01:39 +0200 |
| commit | 0a293fad29311da1a7472e2faf6790fc34f26ae2 (patch) | |
| tree | a593d00c8461df81570403061488fb0c31421ec0 /core/src/main/java/org | |
| parent | 8c40b2b54eac3e3ab3c41ece5c758be75173191b (diff) | |
Remove some unused code
Diffstat (limited to 'core/src/main/java/org')
86 files changed, 135 insertions, 255 deletions
diff --git a/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java b/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java index ea504f7688..e1ae7b938b 100644 --- a/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java +++ b/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.unit.ByteSizeValue; */ public class StoreRateLimiting { - public static interface Provider { + public interface Provider { StoreRateLimiting rateLimiting(); } diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java index 321b7e2a8e..2c16bcb5e9 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java @@ -38,7 +38,7 @@ public class BulkShardRequest extends ReplicatedWriteRequest<BulkShardRequest> { public BulkShardRequest() { } - BulkShardRequest(BulkRequest bulkRequest, ShardId shardId, RefreshPolicy refreshPolicy, BulkItemRequest[] items) { + BulkShardRequest(ShardId shardId, RefreshPolicy refreshPolicy, BulkItemRequest[] items) { super(shardId); this.items = items; setRefreshPolicy(refreshPolicy); diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java index c6b046a475..022a427081 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java @@ -344,7 +344,7 @@ public class TransportBulkAction extends HandledTransportAction<BulkRequest, Bul for (Map.Entry<ShardId, List<BulkItemRequest>> entry : requestsByShard.entrySet()) { final ShardId shardId = entry.getKey(); final List<BulkItemRequest> requests = entry.getValue(); - BulkShardRequest bulkShardRequest = new BulkShardRequest(bulkRequest, shardId, bulkRequest.getRefreshPolicy(), + BulkShardRequest bulkShardRequest = new BulkShardRequest(shardId, bulkRequest.getRefreshPolicy(), requests.toArray(new BulkItemRequest[requests.size()])); bulkShardRequest.consistencyLevel(bulkRequest.consistencyLevel()); bulkShardRequest.timeout(bulkRequest.timeout()); diff --git a/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java index 1084cf6c23..dc49f2f7ad 100644 --- a/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java +++ b/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java @@ -131,7 +131,7 @@ public class TransportExplainAction extends TransportSingleShardAction<ExplainRe // Advantage is that we're not opening a second searcher to retrieve the _source. Also // because we are working in the same searcher in engineGetResult we can be sure that a // doc isn't deleted between the initial get and this call. - GetResult getResult = indexShard.getService().get(result, request.id(), request.type(), request.fields(), request.fetchSourceContext(), false); + GetResult getResult = indexShard.getService().get(result, request.id(), request.type(), request.fields(), request.fetchSourceContext()); return new ExplainResponse(shardId.getIndexName(), request.type(), request.id(), true, explanation, getResult); } else { return new ExplainResponse(shardId.getIndexName(), request.type(), request.id(), true, explanation); diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java b/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java index 07f5ea695d..e0e4d4f4c9 100644 --- a/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java +++ b/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java @@ -36,5 +36,5 @@ public interface WriteResponse { * {@link RefreshPolicy#IMMEDIATE} should always mark this as true. Requests that set it to {@link RefreshPolicy#WAIT_UNTIL} will only * set this to true if they run out of refresh listener slots (see {@link IndexSettings#MAX_REFRESH_LISTENERS_PER_SHARD}). */ - public abstract void setForcedRefresh(boolean forcedRefresh); + void setForcedRefresh(boolean forcedRefresh); } diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java index f04e5604a6..b75cde3f76 100644 --- a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java +++ b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java @@ -298,7 +298,6 @@ public class ReplicationResponse extends ActionResponse { private static final String _SHARDS = "_shards"; private static final String TOTAL = "total"; private static final String SUCCESSFUL = "successful"; - private static final String PENDING = "pending"; private static final String FAILED = "failed"; private static final String FAILURES = "failures"; diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java index 4080d40e69..3f33b2e390 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java @@ -595,7 +595,7 @@ public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> i } else if (currentFieldName.equals("per_field_analyzer") || currentFieldName.equals("perFieldAnalyzer")) { termVectorsRequest.perFieldAnalyzer(readPerFieldAnalyzer(parser.map())); } else if (currentFieldName.equals("filter")) { - termVectorsRequest.filterSettings(readFilterSettings(parser, termVectorsRequest)); + termVectorsRequest.filterSettings(readFilterSettings(parser)); } else if ("_index".equals(currentFieldName)) { // the following is important for multi request parsing. termVectorsRequest.index = parser.text(); } else if ("_type".equals(currentFieldName)) { @@ -641,7 +641,7 @@ public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> i return mapStrStr; } - private static FilterSettings readFilterSettings(XContentParser parser, TermVectorsRequest termVectorsRequest) throws IOException { + private static FilterSettings readFilterSettings(XContentParser parser) throws IOException { FilterSettings settings = new FilterSettings(); XContentParser.Token token; String currentFieldName = null; diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index e2a035d3b5..aa92510e38 100644 --- a/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -22,8 +22,6 @@ package org.elasticsearch.action.update; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.client.Requests; -import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; @@ -63,13 +61,11 @@ import java.util.Map; public class UpdateHelper extends AbstractComponent { private final ScriptService scriptService; - private final ClusterService clusterService; @Inject - public UpdateHelper(Settings settings, ScriptService scriptService, ClusterService clusterService) { + public UpdateHelper(Settings settings, ScriptService scriptService) { super(settings); this.scriptService = scriptService; - this.clusterService = clusterService; } /** diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java index d4ceb844ec..c17bc08ac0 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java @@ -26,16 +26,16 @@ package org.elasticsearch.cluster; public interface ClusterInfoService { /** The latest cluster information */ - public ClusterInfo getClusterInfo(); + ClusterInfo getClusterInfo(); /** Add a listener that will be called every time new information is gathered */ - public void addListener(Listener listener); + void addListener(Listener listener); /** * Interface for listeners to implement in order to perform actions when * new information about the cluster has been gathered */ - public interface Listener { - public void onNewInfo(ClusterInfo info); + interface Listener { + void onNewInfo(ClusterInfo info); } } diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java index 95accc4db8..0ec3c5f863 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java @@ -32,7 +32,7 @@ public interface IndexTemplateFilter { */ boolean apply(CreateIndexClusterStateUpdateRequest request, IndexTemplateMetaData template); - static class Compound implements IndexTemplateFilter { + class Compound implements IndexTemplateFilter { private IndexTemplateFilter[] filters; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java index 981e6dc191..78206cd118 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java @@ -19,11 +19,8 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.Version; import org.elasticsearch.action.TimestampParsingException; import org.elasticsearch.cluster.AbstractDiffable; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -34,11 +31,9 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; import java.io.IOException; -import java.util.Arrays; import java.util.Map; import static org.elasticsearch.common.xcontent.support.XContentMapValues.lenientNodeBooleanValue; @@ -82,8 +77,6 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> { public static class Timestamp { - private static final FormatDateTimeFormatter EPOCH_MILLIS_PARSER = Joda.forPattern("epoch_millis"); - public static String parseStringTimestamp(String timestampAsString, FormatDateTimeFormatter dateTimeFormatter) throws TimestampParsingException { try { return Long.toString(dateTimeFormatter.parser().parseMillis(timestampAsString)); diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java index 8f59ea3a52..625f1a0bb5 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.Index; -import org.elasticsearch.index.NodeServicesProvider; import org.elasticsearch.index.IndexService; +import org.elasticsearch.index.NodeServicesProvider; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.indices.IndexTemplateAlreadyExistsException; @@ -160,7 +160,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent { throw new IndexTemplateAlreadyExistsException(request.name); } - validateAndAddTemplate(request, templateBuilder, indicesService, nodeServicesProvider, metaDataCreateIndexService); + validateAndAddTemplate(request, templateBuilder, indicesService, nodeServicesProvider); for (Alias alias : request.aliases) { AliasMetaData aliasMetaData = AliasMetaData.builder(alias.name()).filter(alias.filter()) @@ -185,7 +185,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent { } private static void validateAndAddTemplate(final PutRequest request, IndexTemplateMetaData.Builder templateBuilder, IndicesService indicesService, - NodeServicesProvider nodeServicesProvider, MetaDataCreateIndexService metaDataCreateIndexService) throws Exception { + NodeServicesProvider nodeServicesProvider) throws Exception { Index createdIndex = null; final String temporaryIndexName = UUIDs.randomBase64UUID(); try { @@ -276,7 +276,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent { } } - public static interface PutListener { + public interface PutListener { void onResponse(PutResponse response); @@ -391,7 +391,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent { } } - public static interface RemoveListener { + public interface RemoveListener { void onResponse(RemoveResponse response); diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java index 5b24ac7edf..ef3fae4830 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java @@ -229,11 +229,4 @@ public class OperationRouting extends AbstractComponent { // of original index to hash documents return Math.floorMod(hash, indexMetaData.getRoutingNumShards()) / indexMetaData.getRoutingFactor(); } - - private void ensureNodeIdExists(DiscoveryNodes nodes, String nodeId) { - if (!nodes.getDataNodes().keys().contains(nodeId)) { - throw new IllegalArgumentException("No data node with id[" + nodeId + "] found"); - } - } - } diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java index ca341451fe..edeb609a9c 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java @@ -505,7 +505,6 @@ public class DiskThresholdDecider extends AllocationDecider { } private DiskUsage getDiskUsage(RoutingNode node, RoutingAllocation allocation, ImmutableOpenMap<String, DiskUsage> usages) { - ClusterInfo clusterInfo = allocation.clusterInfo(); DiskUsage usage = usages.get(node.nodeId()); if (usage == null) { // If there is no usage, and we have other nodes in the cluster, diff --git a/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java b/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java index 0cdcfec1cf..a74c5fbec3 100644 --- a/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java +++ b/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java @@ -23,5 +23,5 @@ package org.elasticsearch.common; * Generates opaque unique strings. */ interface UUIDGenerator { - public String getBase64UUID(); + String getBase64UUID(); } 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 c6900e2ae4..efd8d529d4 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java +++ b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java @@ -80,7 +80,7 @@ public enum GeoDistance implements Writeable { @Override public FixedSourceDistance fixedSourceDistance(double sourceLatitude, double sourceLongitude, DistanceUnit unit) { - return new FactorFixedSourceDistance(sourceLatitude, sourceLongitude, unit); + return new FactorFixedSourceDistance(sourceLatitude, sourceLongitude); } }, /** @@ -217,12 +217,12 @@ public enum GeoDistance implements Writeable { throw new IllegalArgumentException("No geo distance for [" + name + "]"); } - public static interface FixedSourceDistance { + public interface FixedSourceDistance { double calculate(double targetLatitude, double targetLongitude); } - public static interface DistanceBoundingCheck { + public interface DistanceBoundingCheck { boolean isWithin(double targetLatitude, double targetLongitude); @@ -331,7 +331,7 @@ public enum GeoDistance implements Writeable { private final double sinA; private final double cosA; - public FactorFixedSourceDistance(double sourceLatitude, double sourceLongitude, DistanceUnit unit) { + public FactorFixedSourceDistance(double sourceLatitude, double sourceLongitude) { this.sourceLongitude = sourceLongitude; this.a = Math.toRadians(90D - sourceLatitude); this.sinA = Math.sin(a); diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java index 9fad4fb8ef..589829f661 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java +++ b/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java @@ -19,20 +19,19 @@ package org.elasticsearch.common.geo.builders; -import org.locationtech.spatial4j.exception.InvalidShapeException; -import org.locationtech.spatial4j.shape.Shape; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LinearRing; import com.vividsolutions.jts.geom.MultiPolygon; import com.vividsolutions.jts.geom.Polygon; - import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.XContentBuilder; +import org.locationtech.spatial4j.exception.InvalidShapeException; +import org.locationtech.spatial4j.shape.Shape; import java.io.IOException; import java.util.ArrayList; @@ -579,7 +578,7 @@ public class PolygonBuilder extends ShapeBuilder { boolean direction = (component == 0 ^ orientation == Orientation.RIGHT); // set the points array accordingly (shell or hole) Coordinate[] points = (hole != null) ? hole.coordinates(false) : shell.coordinates(false); - ring(component, direction, orientation == Orientation.LEFT, shell, points, 0, edges, offset, points.length-1, translated); + ring(component, direction, orientation == Orientation.LEFT, points, 0, edges, offset, points.length-1, translated); return points.length-1; } @@ -594,7 +593,7 @@ public class PolygonBuilder extends ShapeBuilder { * number of points * @return Array of edges */ - private static Edge[] ring(int component, boolean direction, boolean handedness, LineStringBuilder shell, + private static Edge[] ring(int component, boolean direction, boolean handedness, Coordinate[] points, int offset, Edge[] edges, int toffset, int length, final AtomicBoolean translated) { // calculate the direction of the points: // find the point a the top of the set and check its diff --git a/core/src/main/java/org/elasticsearch/common/inject/Scope.java b/core/src/main/java/org/elasticsearch/common/inject/Scope.java index dacb105fa3..073ce7d5fd 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/Scope.java +++ b/core/src/main/java/org/elasticsearch/common/inject/Scope.java @@ -47,7 +47,7 @@ public interface Scope { * when an instance of the requested object doesn't already exist in this * scope */ - public <T> Provider<T> scope(Key<T> key, Provider<T> unscoped); + <T> Provider<T> scope(Key<T> key, Provider<T> unscoped); /** * A short but useful description of this scope. For comparison, the standard diff --git a/core/src/main/java/org/elasticsearch/common/inject/State.java b/core/src/main/java/org/elasticsearch/common/inject/State.java index 2337816b01..761a7e4b52 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/State.java +++ b/core/src/main/java/org/elasticsearch/common/inject/State.java @@ -36,7 +36,7 @@ import static java.util.Collections.emptySet; */ interface State { - static final State NONE = new State() { + State NONE = new State() { @Override public State parent() { throw new UnsupportedOperationException(); diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java b/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java index b2203ed3b6..41933472ce 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java +++ b/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java @@ -29,7 +29,7 @@ public interface InternalFactory<T> { * ES: * An factory that returns a pre created instance. */ - public static class Instance<T> implements InternalFactory<T> { + class Instance<T> implements InternalFactory<T> { private final T object; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java b/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java index e22fb0f665..6a49034d0b 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java @@ -22,7 +22,6 @@ package org.elasticsearch.common.lucene.all; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SmallFloat; @@ -38,12 +37,10 @@ public final class AllTokenStream extends TokenFilter { } private final BytesRef payloadSpare = new BytesRef(new byte[1]); - private final OffsetAttribute offsetAttribute; private final PayloadAttribute payloadAttribute; AllTokenStream(TokenStream input, float boost) { super(input); - offsetAttribute = addAttribute(OffsetAttribute.class); payloadAttribute = addAttribute(PayloadAttribute.class); payloadSpare.bytes[0] = SmallFloat.floatToByte315(boost); } diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java index 636b1e40af..32c5e7a0da 100644 --- a/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java +++ b/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java @@ -49,7 +49,6 @@ public final class SettingsFilter extends AbstractComponent { public SettingsFilter(Settings settings, Collection<String> patterns) { super(settings); - HashSet<String> set = new HashSet<>(); for (String pattern : patterns) { if (isValidPattern(pattern) == false) { throw new IllegalArgumentException("invalid pattern: " + pattern); diff --git a/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java index 67c09e42db..080824befb 100644 --- a/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java +++ b/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java @@ -33,7 +33,7 @@ import java.util.Map; */ public interface SettingsLoader { - static class Helper { + class Helper { public static Map<String, String> loadNestedFromMap(@Nullable Map map) { Map<String, String> settings = new HashMap<>(); diff --git a/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java b/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java index 4f5a3966d4..f88f1de8fe 100644 --- a/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java +++ b/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java @@ -80,7 +80,7 @@ public class PortsRange { return success; } - public static interface PortCallback { + public interface PortCallback { boolean onPortNumber(int portNumber); } } 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 99ba37a4f6..08e8af2bff 100644 --- a/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java +++ b/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java @@ -48,5 +48,5 @@ public interface TransportAddress extends Writeable { boolean isLoopbackOrLinkLocalAddress(); - public String toString(); + String toString(); } diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArray.java b/core/src/main/java/org/elasticsearch/common/util/BigArray.java index 6fc2b10ed5..5c108a9d50 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigArray.java @@ -26,6 +26,6 @@ import org.elasticsearch.common.lease.Releasable; public interface BigArray extends Releasable, Accountable { /** Return the length of this array. */ - public long size(); + long size(); } diff --git a/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java b/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java index f38b6a5641..819d913bbd 100644 --- a/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java @@ -27,21 +27,21 @@ public interface DoubleArray extends BigArray { /** * Get an element given its index. */ - public abstract double get(long index); + double get(long index); /** * Set a value at the given index and return the previous value. */ - public abstract double set(long index, double value); + double set(long index, double value); /** * Increment value at the given index by <code>inc</code> and return the value. */ - public abstract double increment(long index, double inc); + double increment(long index, double inc); /** * Fill slots between <code>fromIndex</code> inclusive to <code>toIndex</code> exclusive with <code>value</code>. */ - public abstract void fill(long fromIndex, long toIndex, double value); + void fill(long fromIndex, long toIndex, double value); } diff --git a/core/src/main/java/org/elasticsearch/common/util/FloatArray.java b/core/src/main/java/org/elasticsearch/common/util/FloatArray.java index a90298e8ed..a07bb35dfb 100644 --- a/core/src/main/java/org/elasticsearch/common/util/FloatArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/FloatArray.java @@ -27,21 +27,21 @@ public interface FloatArray extends BigArray { /** * Get an element given its index. */ - public abstract float get(long index); + float get(long index); /** * Set a value at the given index and return the previous value. */ - public abstract float set(long index, float value); + float set(long index, float value); /** * Increment value at the given index by <code>inc</code> and return the value. */ - public abstract float increment(long index, float inc); + float increment(long index, float inc); /** * Fill slots between <code>fromIndex</code> inclusive to <code>toIndex</code> exclusive with <code>value</code>. */ - public abstract void fill(long fromIndex, long toIndex, float value); + void fill(long fromIndex, long toIndex, float value); } diff --git a/core/src/main/java/org/elasticsearch/common/util/IntArray.java b/core/src/main/java/org/elasticsearch/common/util/IntArray.java index 096b81be49..2a7214b0f7 100644 --- a/core/src/main/java/org/elasticsearch/common/util/IntArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/IntArray.java @@ -27,21 +27,21 @@ public interface IntArray extends BigArray { /** * Get an element given its index. */ - public abstract int get(long index); + int get(long index); /** * Set a value at the given index and return the previous value. */ - public abstract int set(long index, int value); + int set(long index, int value); /** * Increment value at the given index by <code>inc</code> and return the value. */ - public abstract int increment(long index, int inc); + int increment(long index, int inc); /** * Fill slots between <code>fromIndex</code> inclusive to <code>toIndex</code> exclusive with <code>value</code>. */ - public abstract void fill(long fromIndex, long toIndex, int value); + void fill(long fromIndex, long toIndex, int value); } diff --git a/core/src/main/java/org/elasticsearch/common/util/LongArray.java b/core/src/main/java/org/elasticsearch/common/util/LongArray.java index 670f729da1..fe8a40008d 100644 --- a/core/src/main/java/org/elasticsearch/common/util/LongArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/LongArray.java @@ -27,21 +27,21 @@ public interface LongArray extends BigArray { /** * Get an element given its index. */ - public abstract long get(long index); + long get(long index); /** * Set a value at the given index and return the previous value. */ - public abstract long set(long index, long value); + long set(long index, long value); /** * Increment value at the given index by <code>inc</code> and return the value. */ - public abstract long increment(long index, long inc); + long increment(long index, long inc); /** * Fill slots between <code>fromIndex</code> inclusive to <code>toIndex</code> exclusive with <code>value</code>. */ - public abstract void fill(long fromIndex, long toIndex, long value); + void fill(long fromIndex, long toIndex, long value); } 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 512690595e..c715fceb84 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 @@ -263,8 +263,7 @@ public final class ThreadContext implements Closeable, Writeable { } private void putSingleHeader(String key, String value, Map<String, String> newHeaders) { - final String existingValue; - if ((existingValue = newHeaders.putIfAbsent(key, value)) != null) { + if (newHeaders.putIfAbsent(key, value) != null) { throw new IllegalArgumentException("value for key [" + key + "] already present"); } } diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java index 2d39578ea9..01111fa940 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java @@ -29,7 +29,7 @@ import java.util.Map; */ public interface ToXContent { - public static interface Params { + interface Params { String param(String key); String param(String key, String defaultValue); @@ -39,7 +39,7 @@ public interface ToXContent { Boolean paramAsBoolean(String key, Boolean defaultValue); } - public static final Params EMPTY_PARAMS = new Params() { + Params EMPTY_PARAMS = new Params() { @Override public String param(String key) { return null; @@ -62,7 +62,7 @@ public interface ToXContent { }; - public static class MapParams implements Params { + class MapParams implements Params { private final Map<String, String> params; @@ -95,7 +95,7 @@ public interface ToXContent { } } - public static class DelegatingMapParams extends MapParams { + class DelegatingMapParams extends MapParams { private final Params delegate; diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java index 39a6fca109..eaaa98167b 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java @@ -228,23 +228,13 @@ public abstract class AbstractXContentParser implements XContentParser { return readListOrderedMap(this); } - static interface MapFactory { + interface MapFactory { Map<String, Object> newMap(); } - static final MapFactory SIMPLE_MAP_FACTORY = new MapFactory() { - @Override - public Map<String, Object> newMap() { - return new HashMap<>(); - } - }; + static final MapFactory SIMPLE_MAP_FACTORY = HashMap::new; - static final MapFactory ORDERED_MAP_FACTORY = new MapFactory() { - @Override - public Map<String, Object> newMap() { - return new LinkedHashMap<>(); - } - }; + static final MapFactory ORDERED_MAP_FACTORY = LinkedHashMap::new; static Map<String, Object> readMap(XContentParser parser) throws IOException { return readMap(parser, SIMPLE_MAP_FACTORY); diff --git a/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java index 9b8e148550..a711427de7 100644 --- a/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java @@ -50,7 +50,6 @@ import java.util.HashSet; import java.util.Queue; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.cluster.ClusterState.Builder; @@ -69,8 +68,6 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem private volatile boolean master = false; - private final AtomicBoolean initialStateSent = new AtomicBoolean(); - private static final ConcurrentMap<ClusterName, ClusterGroup> clusterGroups = ConcurrentCollections.newConcurrentMap(); private volatile ClusterState lastProcessedClusterState; diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index eca34389d9..0efbe64196 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -197,7 +197,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen discoverySettings, clusterService.getClusterName()); this.pingService.setPingContextProvider(this); - this.membership = new MembershipAction(settings, clusterService, transportService, this, new MembershipListener()); + this.membership = new MembershipAction(settings, transportService, this, new MembershipListener()); this.joinThreadControl = new JoinThreadControl(threadPool); diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java index 4668696574..1de3805d67 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java @@ -21,7 +21,6 @@ package org.elasticsearch.discovery.zen.membership; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -48,13 +47,13 @@ public class MembershipAction extends AbstractComponent { public static final String DISCOVERY_JOIN_VALIDATE_ACTION_NAME = "internal:discovery/zen/join/validate"; public static final String DISCOVERY_LEAVE_ACTION_NAME = "internal:discovery/zen/leave"; - public static interface JoinCallback { + public interface JoinCallback { void onSuccess(); void onFailure(Throwable t); } - public static interface MembershipListener { + public interface MembershipListener { void onJoin(DiscoveryNode node, JoinCallback callback); void onLeave(DiscoveryNode node); @@ -66,14 +65,11 @@ public class MembershipAction extends AbstractComponent { private final MembershipListener listener; - private final ClusterService clusterService; - - public MembershipAction(Settings settings, ClusterService clusterService, TransportService transportService, DiscoveryNodesProvider nodesProvider, MembershipListener listener) { + public MembershipAction(Settings settings, TransportService transportService, DiscoveryNodesProvider nodesProvider, MembershipListener listener) { super(settings); this.transportService = transportService; this.nodesProvider = nodesProvider; this.listener = listener; - this.clusterService = clusterService; transportService.registerRequestHandler(DISCOVERY_JOIN_ACTION_NAME, JoinRequest::new, ThreadPool.Names.GENERIC, new JoinRequestRequestHandler()); transportService.registerRequestHandler(DISCOVERY_JOIN_VALIDATE_ACTION_NAME, ValidateJoinRequest::new, ThreadPool.Names.GENERIC, new ValidateJoinRequestRequestHandler()); diff --git a/core/src/main/java/org/elasticsearch/gateway/Gateway.java b/core/src/main/java/org/elasticsearch/gateway/Gateway.java index 919db87d38..ee2abc17ab 100644 --- a/core/src/main/java/org/elasticsearch/gateway/Gateway.java +++ b/core/src/main/java/org/elasticsearch/gateway/Gateway.java @@ -32,7 +32,6 @@ import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.Index; import org.elasticsearch.index.NodeServicesProvider; import org.elasticsearch.indices.IndicesService; @@ -47,8 +46,6 @@ public class Gateway extends AbstractComponent implements ClusterStateListener { private final ClusterService clusterService; - private final NodeEnvironment nodeEnv; - private final GatewayMetaState metaState; private final TransportNodesListGatewayMetaState listGatewayMetaState; @@ -57,14 +54,13 @@ public class Gateway extends AbstractComponent implements ClusterStateListener { private final IndicesService indicesService; private final NodeServicesProvider nodeServicesProvider; - public Gateway(Settings settings, ClusterService clusterService, NodeEnvironment nodeEnv, GatewayMetaState metaState, + public Gateway(Settings settings, ClusterService clusterService, GatewayMetaState metaState, TransportNodesListGatewayMetaState listGatewayMetaState, Discovery discovery, NodeServicesProvider nodeServicesProvider, IndicesService indicesService) { super(settings); this.nodeServicesProvider = nodeServicesProvider; this.indicesService = indicesService; this.clusterService = clusterService; - this.nodeEnv = nodeEnv; this.metaState = metaState; this.listGatewayMetaState = listGatewayMetaState; this.minimumMasterNodesProvider = discovery::getMinimumMasterNodes; diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayService.java b/core/src/main/java/org/elasticsearch/gateway/GatewayService.java index 7261f81269..8bd1dcbd6e 100644 --- a/core/src/main/java/org/elasticsearch/gateway/GatewayService.java +++ b/core/src/main/java/org/elasticsearch/gateway/GatewayService.java @@ -42,7 +42,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.NodeServicesProvider; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.rest.RestStatus; @@ -96,11 +95,11 @@ public class GatewayService extends AbstractLifecycleComponent<GatewayService> i @Inject public GatewayService(Settings settings, AllocationService allocationService, ClusterService clusterService, - ThreadPool threadPool, NodeEnvironment nodeEnvironment, GatewayMetaState metaState, + ThreadPool threadPool, GatewayMetaState metaState, TransportNodesListGatewayMetaState listGatewayMetaState, Discovery discovery, NodeServicesProvider nodeServicesProvider, IndicesService indicesService) { super(settings); - this.gateway = new Gateway(settings, clusterService, nodeEnvironment, metaState, listGatewayMetaState, discovery, + this.gateway = new Gateway(settings, clusterService, metaState, listGatewayMetaState, discovery, nodeServicesProvider, indicesService); this.allocationService = allocationService; this.clusterService = clusterService; diff --git a/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java b/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java index c8d82eae88..b5856d606e 100644 --- a/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java +++ b/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java @@ -157,7 +157,6 @@ public final class MergePolicyConfig { MergePolicyConfig(ESLogger logger, IndexSettings indexSettings) { this.logger = logger; - IndexScopedSettings scopedSettings = indexSettings.getScopedSettings(); double forceMergeDeletesPctAllowed = indexSettings.getValue(INDEX_MERGE_POLICY_EXPUNGE_DELETES_ALLOWED_SETTING); // percentage ByteSizeValue floorSegment = indexSettings.getValue(INDEX_MERGE_POLICY_FLOOR_SEGMENT_SETTING); int maxMergeAtOnce = indexSettings.getValue(INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING); diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java index bafa00b7c5..d85073a068 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java @@ -41,7 +41,6 @@ import java.util.List; public class MultiOrdinals extends Ordinals { private static final int OFFSETS_PAGE_SIZE = 1024; - private static final int OFFSET_INIT_PAGE_COUNT = 16; /** * Return true if this impl is going to be smaller than {@link SinglePackedOrdinals} by at least 20%. diff --git a/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java index 10c2e636e9..8004b91296 100644 --- a/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java +++ b/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java @@ -110,7 +110,7 @@ public final class ShardGetService extends AbstractIndexShardComponent { * <p> * Note: Call <b>must</b> release engine searcher associated with engineGetResult! */ - public GetResult get(Engine.GetResult engineGetResult, String id, String type, String[] fields, FetchSourceContext fetchSourceContext, boolean ignoreErrorsOnGeneratedFields) { + public GetResult get(Engine.GetResult engineGetResult, String id, String type, String[] fields, FetchSourceContext fetchSourceContext) { if (!engineGetResult.exists()) { return new GetResult(shardId.getIndexName(), type, id, -1, false, null, null); } @@ -119,7 +119,7 @@ public final class ShardGetService extends AbstractIndexShardComponent { try { long now = System.nanoTime(); fetchSourceContext = normalizeFetchSourceContent(fetchSourceContext, fields); - GetResult getResult = innerGetLoadFromStoredFields(type, id, fields, fetchSourceContext, engineGetResult, mapperService, ignoreErrorsOnGeneratedFields); + GetResult getResult = innerGetLoadFromStoredFields(type, id, fields, fetchSourceContext, engineGetResult, mapperService); if (getResult.isExists()) { existsMetric.inc(System.nanoTime() - now); } else { @@ -183,7 +183,7 @@ public final class ShardGetService extends AbstractIndexShardComponent { try { // break between having loaded it from translog (so we only have _source), and having a document to load if (get.docIdAndVersion() != null) { - return innerGetLoadFromStoredFields(type, id, gFields, fetchSourceContext, get, mapperService, ignoreErrorsOnGeneratedFields); + return innerGetLoadFromStoredFields(type, id, gFields, fetchSourceContext, get, mapperService); } else { Translog.Source source = get.source(); @@ -316,7 +316,7 @@ public final class ShardGetService extends AbstractIndexShardComponent { } } - private GetResult innerGetLoadFromStoredFields(String type, String id, String[] gFields, FetchSourceContext fetchSourceContext, Engine.GetResult get, MapperService mapperService, boolean ignoreErrorsOnGeneratedFields) { + private GetResult innerGetLoadFromStoredFields(String type, String id, String[] gFields, FetchSourceContext fetchSourceContext, Engine.GetResult get, MapperService mapperService) { Map<String, GetField> fields = null; BytesReference source = null; Versions.DocIdAndVersion docIdAndVersion = get.docIdAndVersion(); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index 41f8963b59..48199a49b3 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -76,7 +76,7 @@ final class DocumentParser { docMapperParser, docMapper, source, parser); validateStart(parser); internalParseDocument(mapping, context, parser); - validateEnd(source, parser); + validateEnd(parser); } catch (Throwable t) { throw wrapInMapperParsingException(source, t); } @@ -128,7 +128,7 @@ final class DocumentParser { } } - private static void validateEnd(SourceToParse source, XContentParser parser) throws IOException { + private static void validateEnd(XContentParser parser) throws IOException { XContentParser.Token token;// only check for end of tokens if we created the parser here // try to parse the next token, this should be null if the object is ended properly // but will throw a JSON exception if the extra tokens is not valid JSON (this will be handled by the catch) @@ -368,7 +368,6 @@ final class DocumentParser { token = parser.nextToken(); } - ObjectMapper update = null; innerParseObject(context, mapper, parser, currentFieldName, token); // restore the enable path flag if (nested.isNested()) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java index 34a0ead059..c3c23d82f7 100755 --- a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper; import com.carrotsearch.hppc.ObjectHashSet; - import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; @@ -35,7 +34,6 @@ import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.AbstractIndexComponent; -import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.mapper.Mapper.BuilderContext; @@ -316,7 +314,7 @@ public class MapperService extends AbstractIndexComponent { Collections.addAll(fieldMappers, newMapper.mapping().metadataMappers); MapperUtils.collect(newMapper.mapping().root(), objectMappers, fieldMappers); checkFieldUniqueness(newMapper.type(), objectMappers, fieldMappers); - checkObjectsCompatibility(newMapper.type(), objectMappers, fieldMappers, updateAllTypes); + checkObjectsCompatibility(objectMappers, updateAllTypes); // 3. update lookup data-structures // this will in particular make sure that the merged fields are compatible with other types @@ -381,7 +379,7 @@ public class MapperService extends AbstractIndexComponent { for (DocumentMapper mapper : docMappers(false)) { List<FieldMapper> fieldMappers = new ArrayList<>(); Collections.addAll(fieldMappers, mapper.mapping().metadataMappers); - MapperUtils.collect(mapper.root(), new ArrayList<ObjectMapper>(), fieldMappers); + MapperUtils.collect(mapper.root(), new ArrayList<>(), fieldMappers); for (FieldMapper fieldMapper : fieldMappers) { assert fieldMapper.fieldType() == fieldTypes.get(fieldMapper.name()) : fieldMapper.name(); } @@ -449,7 +447,7 @@ public class MapperService extends AbstractIndexComponent { } } - private void checkObjectsCompatibility(String type, Collection<ObjectMapper> objectMappers, Collection<FieldMapper> fieldMappers, boolean updateAllTypes) { + private void checkObjectsCompatibility(Collection<ObjectMapper> objectMappers, boolean updateAllTypes) { assert Thread.holdsLock(this); for (ObjectMapper newObjectMapper : objectMappers) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java index 27b983060a..64be912733 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java @@ -310,8 +310,6 @@ public abstract class ParseContext { private Field version; - private StringBuilder stringBuilder = new StringBuilder(); - private final AllEntries allEntries; private final List<Mapper> dynamicMappers; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java index 24a86b1139..6889cd90fd 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.Version; import org.elasticsearch.action.TimestampParsingException; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.lucene.Lucene; @@ -82,7 +81,7 @@ public class TimestampFieldMapper extends MetadataFieldMapper { private String defaultTimestamp = Defaults.DEFAULT_TIMESTAMP; private Boolean ignoreMissing = null; - public Builder(MappedFieldType existing, Settings settings) { + public Builder(MappedFieldType existing) { super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE); } @@ -130,7 +129,7 @@ public class TimestampFieldMapper extends MetadataFieldMapper { if (parserContext.indexVersionCreated().onOrAfter(Version.V_5_0_0_alpha4)) { throw new IllegalArgumentException("[_timestamp] is removed in 5.0. As a replacement, you can use an ingest pipeline to add a field with the current timestamp to your documents."); } - Builder builder = new Builder(parserContext.mapperService().fullName(NAME), parserContext.mapperService().getIndexSettings().getSettings()); + Builder builder = new Builder(parserContext.mapperService().fullName(NAME)); boolean defaultSet = false; Boolean ignoreMissing = null; for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) { diff --git a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java index 692c157c1b..69ba746c88 100644 --- a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java @@ -405,7 +405,6 @@ public class CommonTermsQueryBuilder extends AbstractQueryBuilder<CommonTermsQue private static Query parseQueryString(ExtendedCommonTermsQuery query, Object queryString, String field, Analyzer analyzer, String lowFreqMinimumShouldMatch, String highFreqMinimumShouldMatch) throws IOException { // Logic similar to QueryParser#getFieldQuery - int count = 0; try (TokenStream source = analyzer.tokenStream(field, queryString.toString())) { source.reset(); CharTermAttribute termAtt = source.addAttribute(CharTermAttribute.class); @@ -414,7 +413,6 @@ public class CommonTermsQueryBuilder extends AbstractQueryBuilder<CommonTermsQue // UTF-8 builder.copyChars(termAtt); query.add(new Term(field, builder.toBytesRef())); - count++; } } diff --git a/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java b/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java index f4b26cd988..a72cfc48b6 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java +++ b/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java @@ -43,8 +43,6 @@ public class SnapshotStatus { private Translog translog = new Translog(); - private Throwable failure; - public Stage stage() { return this.stage; } @@ -70,10 +68,6 @@ public class SnapshotStatus { this.time = time; } - public void failed(Throwable failure) { - this.failure = failure; - } - public Index index() { return index; } diff --git a/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java b/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java index e4534e59d8..6b8bc60767 100644 --- a/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java +++ b/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java @@ -202,7 +202,7 @@ public class TermVectorsService { /* generate term vectors from fetched document fields */ GetResult getResult = indexShard.getService().get( - get, request.id(), request.type(), validFields.toArray(Strings.EMPTY_ARRAY), null, false); + get, request.id(), request.type(), validFields.toArray(Strings.EMPTY_ARRAY), null); Fields generatedTermVectors = generateTermVectors(indexShard, getResult.getFields().values(), request.offsets(), request.perFieldAnalyzer(), validFields); /* merge with existing Fields */ diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/core/src/main/java/org/elasticsearch/index/translog/Translog.java index fe970dcbc5..083e011516 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/core/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -572,10 +572,6 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC } } - private boolean isReferencedGeneration(long generation) { // used to make decisions if a file can be deleted - return generation >= lastCommittedTranslogFileGeneration; - } - public TranslogConfig getConfig() { return config; } diff --git a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java index 2787761430..2a09362e87 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java +++ b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java @@ -20,8 +20,8 @@ package org.elasticsearch.indices; import org.elasticsearch.common.component.AbstractComponent; -import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Setting; +import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; @@ -34,8 +34,6 @@ import org.elasticsearch.index.engine.FlushNotAllowedEngineException; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShardState; import org.elasticsearch.index.shard.IndexingOperationListener; -import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.threadpool.ThreadPool; import java.io.Closeable; @@ -94,10 +92,6 @@ public class IndexingMemoryController extends AbstractComponent implements Index private final ShardsIndicesStatusChecker statusChecker; IndexingMemoryController(Settings settings, ThreadPool threadPool, Iterable<IndexShard> indexServices) { - this(settings, threadPool, indexServices, JvmInfo.jvmInfo().getMem().getHeapMax().bytes()); - } - - IndexingMemoryController(Settings settings, ThreadPool threadPool, Iterable<IndexShard> indexServices, long jvmMemoryInBytes) { super(settings); this.indexShards = indexServices; diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java index c143e0762d..181b94f13d 100644 --- a/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java +++ b/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java @@ -20,13 +20,9 @@ package org.elasticsearch.monitor.jvm; import org.apache.lucene.util.CollectionUtil; -import org.apache.lucene.util.Constants; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; -import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.unit.TimeValue; import java.lang.management.ManagementFactory; @@ -45,7 +41,6 @@ import java.util.concurrent.TimeUnit; public class HotThreads { private static final Object mutex = new Object(); - private static final ESLogger logger = Loggers.getLogger(HotThreads.class); private static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("dateOptionalTime"); diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java index 951e776023..383ded2b2d 100644 --- a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java +++ b/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java @@ -409,7 +409,7 @@ public class RepositoriesService extends AbstractComponent implements ClusterSta Repository repository = repositoryInjector.getInstance(Repository.class); IndexShardRepository indexShardRepository = repositoryInjector.getInstance(IndexShardRepository.class); repository.start(); - return new RepositoryHolder(repositoryMetaData.type(), repositoryMetaData.settings(), repositoryInjector, repository, indexShardRepository); + return new RepositoryHolder(repositoryMetaData.type(), repositoryMetaData.settings(), repository, indexShardRepository); } catch (Throwable t) { logger.warn("failed to create repository [{}][{}]", t, repositoryMetaData.type(), repositoryMetaData.name()); throw new RepositoryException(repositoryMetaData.name(), "failed to create repository", t); @@ -473,7 +473,7 @@ public class RepositoriesService extends AbstractComponent implements ClusterSta private final Repository repository; private final IndexShardRepository indexShardRepository; - public RepositoryHolder(String type, Settings settings, Injector injector, Repository repository, IndexShardRepository indexShardRepository) { + public RepositoryHolder(String type, Settings settings,Repository repository, IndexShardRepository indexShardRepository) { this.type = type; this.settings = settings; this.repository = repository; diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java index a40463e3e2..6c6a4592a9 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java @@ -26,7 +26,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.BytesRestResponse; import org.elasticsearch.rest.RestChannel; -import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestStatus; @@ -38,7 +37,7 @@ import static org.elasticsearch.rest.action.support.RestTable.pad; */ public abstract class AbstractCatAction extends BaseRestHandler { - public AbstractCatAction(Settings settings, RestController controller) { + public AbstractCatAction(Settings settings) { super(settings); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java index 9c68d0abbc..deb11b13cd 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java @@ -45,7 +45,7 @@ public class RestAliasAction extends AbstractCatAction { @Inject public RestAliasAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/aliases", this); controller.registerHandler(GET, "/_cat/aliases/{alias}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java index 146b52a63a..33a5841480 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java @@ -49,7 +49,7 @@ public class RestAllocationAction extends AbstractCatAction { @Inject public RestAllocationAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/allocation", this); controller.registerHandler(GET, "/_cat/allocation/{nodes}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java index 032fd5c3ab..27d29ed63b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java @@ -46,7 +46,7 @@ public class RestCountAction extends AbstractCatAction { @Inject public RestCountAction(Settings settings, RestController restController, RestController controller, IndicesQueriesRegistry indicesQueriesRegistry) { - super(settings, controller); + super(settings); restController.registerHandler(GET, "/_cat/count", this); restController.registerHandler(GET, "/_cat/count/{index}", this); this.indicesQueriesRegistry = indicesQueriesRegistry; diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java index d3458b40d7..36ce8247da 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java @@ -44,7 +44,7 @@ public class RestFielddataAction extends AbstractCatAction { @Inject public RestFielddataAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/fielddata", this); controller.registerHandler(GET, "/_cat/fielddata/{fields}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java index 07f36cc2f6..cd38e6591b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java @@ -40,7 +40,7 @@ public class RestHealthAction extends AbstractCatAction { @Inject public RestHealthAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/health", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java index fcdfe009e1..08d45e3311 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java @@ -58,7 +58,7 @@ public class RestIndicesAction extends AbstractCatAction { @Inject public RestIndicesAction(Settings settings, RestController controller, IndexNameExpressionResolver indexNameExpressionResolver) { - super(settings, controller); + super(settings); this.indexNameExpressionResolver = indexNameExpressionResolver; controller.registerHandler(GET, "/_cat/indices", this); controller.registerHandler(GET, "/_cat/indices/{index}", this); diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java index 164c2f79da..5edd764fd1 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java @@ -40,7 +40,7 @@ public class RestMasterAction extends AbstractCatAction { @Inject public RestMasterAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/master", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java index 815895a267..e7d3b15918 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java @@ -48,7 +48,7 @@ public class RestNodeAttrsAction extends AbstractCatAction { @Inject public RestNodeAttrsAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/nodeattrs", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java index cb7bd59be3..26536ab600 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java @@ -73,7 +73,7 @@ public class RestNodesAction extends AbstractCatAction { @Inject public RestNodesAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/nodes", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java index b85906e25b..341a8bd5f8 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java @@ -38,7 +38,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestPendingClusterTasksAction extends AbstractCatAction { @Inject public RestPendingClusterTasksAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/pending_tasks", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java index 13e1f2176d..4850ff312c 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java @@ -45,7 +45,7 @@ public class RestPluginsAction extends AbstractCatAction { @Inject public RestPluginsAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/plugins", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java index 6308ce7e68..a891bbc36f 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java @@ -52,7 +52,7 @@ public class RestRecoveryAction extends AbstractCatAction { @Inject public RestRecoveryAction(Settings settings, RestController restController, RestController controller) { - super(settings, controller); + super(settings); restController.registerHandler(GET, "/_cat/recovery", this); restController.registerHandler(GET, "/_cat/recovery/{index}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java index ee53e1241c..0b1580723b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java @@ -41,7 +41,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestRepositoriesAction extends AbstractCatAction { @Inject public RestRepositoriesAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/repositories", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java index 2540e194d8..95351e7135 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java @@ -50,7 +50,7 @@ public class RestSegmentsAction extends AbstractCatAction { @Inject public RestSegmentsAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/segments", this); controller.registerHandler(GET, "/_cat/segments/{index}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java index 214979aef6..c98518ef17 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java @@ -50,7 +50,7 @@ public class RestShardsAction extends AbstractCatAction { @Inject public RestShardsAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/shards", this); controller.registerHandler(GET, "/_cat/shards/{index}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java index e503118fba..025205174a 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java @@ -48,7 +48,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestSnapshotAction extends AbstractCatAction { @Inject public RestSnapshotAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/snapshots/{repository}", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java index 7486acfbb8..94116e30ad 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java @@ -52,7 +52,7 @@ public class RestTasksAction extends AbstractCatAction { @Inject public RestTasksAction(Settings settings, RestController controller, ClusterService clusterService) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/tasks", this); this.clusterService = clusterService; } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java index 8987fd2741..880995ec5d 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java @@ -109,7 +109,7 @@ public class RestThreadPoolAction extends AbstractCatAction { @Inject public RestThreadPoolAction(Settings settings, RestController controller) { - super(settings, controller); + super(settings); controller.registerHandler(GET, "/_cat/thread_pool", this); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java index 884adcf0d8..c3c4549aa6 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java @@ -51,13 +51,13 @@ public class RestIndexAction extends BaseRestHandler { controller.registerHandler(POST, "/{index}/{type}", this); // auto id creation controller.registerHandler(PUT, "/{index}/{type}/{id}", this); controller.registerHandler(POST, "/{index}/{type}/{id}", this); - CreateHandler createHandler = new CreateHandler(settings, controller); + CreateHandler createHandler = new CreateHandler(settings); controller.registerHandler(PUT, "/{index}/{type}/{id}/_create", createHandler); controller.registerHandler(POST, "/{index}/{type}/{id}/_create", createHandler); } final class CreateHandler extends BaseRestHandler { - protected CreateHandler(Settings settings, RestController controller) { + protected CreateHandler(Settings settings) { super(settings); } diff --git a/core/src/main/java/org/elasticsearch/script/ScriptService.java b/core/src/main/java/org/elasticsearch/script/ScriptService.java index 7d632c0639..e42984aaf9 100644 --- a/core/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/core/src/main/java/org/elasticsearch/script/ScriptService.java @@ -236,7 +236,7 @@ public class ScriptService extends AbstractComponent implements Closeable, Clust } ScriptEngineService scriptEngineService = getScriptEngineServiceForLang(lang); - if (canExecuteScript(lang, scriptEngineService, script.getType(), scriptContext) == false) { + if (canExecuteScript(lang, script.getType(), scriptContext) == false) { throw new IllegalStateException("scripts of type [" + script.getType() + "], operation [" + scriptContext.getKey() + "] and lang [" + lang + "] are disabled"); } @@ -357,7 +357,7 @@ public class ScriptService extends AbstractComponent implements Closeable, Clust ScriptEngineService scriptEngineService = getScriptEngineServiceForLang(scriptLang); //we don't know yet what the script will be used for, but if all of the operations for this lang with //indexed scripts are disabled, it makes no sense to even compile it. - if (isAnyScriptContextEnabled(scriptLang, scriptEngineService, ScriptType.STORED)) { + if (isAnyScriptContextEnabled(scriptLang, ScriptType.STORED)) { Object compiled = scriptEngineService.compile(id, template.getScript(), Collections.emptyMap()); if (compiled == null) { throw new IllegalArgumentException("Unable to parse [" + template.getScript() + @@ -466,16 +466,16 @@ public class ScriptService extends AbstractComponent implements Closeable, Clust return getScriptEngineServiceForLang(compiledScript.lang()).search(compiledScript, lookup, script.getParams()); } - private boolean isAnyScriptContextEnabled(String lang, ScriptEngineService scriptEngineService, ScriptType scriptType) { + private boolean isAnyScriptContextEnabled(String lang, ScriptType scriptType) { for (ScriptContext scriptContext : scriptContextRegistry.scriptContexts()) { - if (canExecuteScript(lang, scriptEngineService, scriptType, scriptContext)) { + if (canExecuteScript(lang, scriptType, scriptContext)) { return true; } } return false; } - private boolean canExecuteScript(String lang, ScriptEngineService scriptEngineService, ScriptType scriptType, ScriptContext scriptContext) { + private boolean canExecuteScript(String lang, ScriptType scriptType, ScriptContext scriptContext) { assert lang != null; if (scriptContextRegistry.isSupportedContext(scriptContext) == false) { throw new IllegalArgumentException("script context [" + scriptContext.getKey() + "] not supported"); @@ -556,7 +556,7 @@ public class ScriptService extends AbstractComponent implements Closeable, Clust try { //we don't know yet what the script will be used for, but if all of the operations for this lang // with file scripts are disabled, it makes no sense to even compile it and cache it. - if (isAnyScriptContextEnabled(engineService.getType(), engineService, ScriptType.FILE)) { + if (isAnyScriptContextEnabled(engineService.getType(), ScriptType.FILE)) { logger.info("compiling script file [{}]", file.toAbsolutePath()); try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(file), StandardCharsets.UTF_8)) { String script = Streams.copyToString(reader); diff --git a/core/src/main/java/org/elasticsearch/search/SearchService.java b/core/src/main/java/org/elasticsearch/search/SearchService.java index 3c17a506eb..bc77a01d07 100644 --- a/core/src/main/java/org/elasticsearch/search/SearchService.java +++ b/core/src/main/java/org/elasticsearch/search/SearchService.java @@ -19,19 +19,7 @@ package org.elasticsearch.search; -import static java.util.Collections.unmodifiableMap; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes; - -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicLong; - +import com.carrotsearch.hppc.ObjectFloatHashMap; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.TopDocs; import org.elasticsearch.ExceptionsHelper; @@ -57,8 +45,8 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.InnerHitBuilder; +import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.shard.IndexEventListener; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.SearchOperationListener; @@ -101,7 +89,18 @@ import org.elasticsearch.search.sort.SortAndFormats; import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.threadpool.ThreadPool; -import com.carrotsearch.hppc.ObjectFloatHashMap; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.atomic.AtomicLong; + +import static java.util.Collections.unmodifiableMap; +import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes; /** * @@ -844,20 +843,6 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> imp } } - private void shortcutDocIdsToLoadForScanning(SearchContext context) { - TopDocs topDocs = context.queryResult().topDocs(); - if (topDocs.scoreDocs.length == 0) { - // no more docs... - context.docIdsToLoad(EMPTY_DOC_IDS, 0, 0); - return; - } - int[] docIdsToLoad = new int[topDocs.scoreDocs.length]; - for (int i = 0; i < docIdsToLoad.length; i++) { - docIdsToLoad[i] = topDocs.scoreDocs[i].doc; - } - context.docIdsToLoad(docIdsToLoad, 0, docIdsToLoad.length); - } - private void processScroll(InternalScrollSearchRequest request, SearchContext context) { // process scroll context.from(context.from() + context.size()); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index 4dba4000da..b7cab31974 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -82,6 +82,7 @@ public class BestBucketsDeferringCollector extends DeferringBucketCollector { } /** Set the deferred collectors. */ + @Override public void setDeferredCollector(Iterable<BucketCollector> deferredCollectors) { this.collector = BucketCollector.wrap(deferredCollectors); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java index 0d5bb5ce50..2336923467 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java @@ -79,6 +79,7 @@ public class BestDocsDeferringCollector extends DeferringBucketCollector impleme } /** Set the deferred collectors. */ + @Override public void setDeferredCollector(Iterable<BucketCollector> deferredCollectors) { this.deferred = BucketCollector.wrap(deferredCollectors); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java index 4f37ec3cf8..7ecf7672bf 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java @@ -34,18 +34,13 @@ import java.io.IOException; */ public abstract class DeferringBucketCollector extends BucketCollector { - private BucketCollector collector; /** Sole constructor. */ public DeferringBucketCollector() {} /** Set the deferred collectors. */ - public void setDeferredCollector(Iterable<BucketCollector> deferredCollectors) { - this.collector = BucketCollector.wrap(deferredCollectors); - } - + public abstract void setDeferredCollector(Iterable<BucketCollector> deferredCollectors); - public final void replay(long... selectedBuckets) throws IOException - { + public final void replay(long... selectedBuckets) throws IOException { prepareSelectedBuckets(selectedBuckets); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java index a6c1dc91b5..bbdd85b969 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java @@ -260,7 +260,6 @@ public class InternalRange<B extends InternalRange.Bucket, R extends InternalRan } private List<B> ranges; - private Map<String, B> rangeMap; protected DocValueFormat format; protected boolean keyed; @@ -333,7 +332,6 @@ public class InternalRange<B extends InternalRange.Bucket, R extends InternalRan ranges.add(getFactory().createBucket(key, in.readDouble(), in.readDouble(), in.readVLong(), InternalAggregations.readAggregations(in), keyed, format)); } this.ranges = ranges; - this.rangeMap = null; } @Override diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java index 44708eba40..e2d3034fa1 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.metrics.scripted; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.script.Script; @@ -34,6 +33,7 @@ import org.elasticsearch.search.aggregations.LeafBucketCollectorBase; import org.elasticsearch.search.aggregations.metrics.MetricsAggregator; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.elasticsearch.search.aggregations.support.AggregationContext; + import java.io.IOException; import java.util.Collections; import java.util.List; @@ -52,7 +52,6 @@ public class ScriptedMetricAggregator extends MetricsAggregator { super(name, context, parent, pipelineAggregators, metaData); this.params = params; ScriptService scriptService = context.searchContext().scriptService(); - ClusterState state = context.searchContext().getQueryShardContext().getClusterState(); if (initScript != null) { scriptService.executable(initScript, ScriptContext.Standard.AGGS, Collections.emptyMap()).run(); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java index 5e53812e72..cb6f76037c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java @@ -32,7 +32,6 @@ public class ValuesSourceConfig<VS extends ValuesSource> { private SearchScript script; private ValueType scriptValueType; private boolean unmapped = false; - private String formatPattern; private DocValueFormat format = DocValueFormat.RAW; private Object missing; private DateTimeZone timeZone; diff --git a/core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java index 51c56e676c..3d08019539 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java @@ -110,7 +110,7 @@ public class FastVectorHighlighter implements Highlighter { if (!forceSource && mapper.fieldType().stored()) { fragmentsBuilder = new SimpleFragmentsBuilder(mapper, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } else { - fragmentsBuilder = new SourceSimpleFragmentsBuilder(mapper, context, hitContext, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); + fragmentsBuilder = new SourceSimpleFragmentsBuilder(mapper, context, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } } else { fragListBuilder = field.fieldOptions().fragmentOffset() == -1 ? new SimpleFragListBuilder() : new SimpleFragListBuilder(field.fieldOptions().fragmentOffset()); @@ -118,13 +118,13 @@ public class FastVectorHighlighter implements Highlighter { if (!forceSource && mapper.fieldType().stored()) { fragmentsBuilder = new ScoreOrderFragmentsBuilder(field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } else { - fragmentsBuilder = new SourceScoreOrderFragmentsBuilder(mapper, context, hitContext, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); + fragmentsBuilder = new SourceScoreOrderFragmentsBuilder(mapper, context, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } } else { if (!forceSource && mapper.fieldType().stored()) { fragmentsBuilder = new SimpleFragmentsBuilder(mapper, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } else { - fragmentsBuilder = new SourceSimpleFragmentsBuilder(mapper, context, hitContext, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); + fragmentsBuilder = new SourceSimpleFragmentsBuilder(mapper, context, field.fieldOptions().preTags(), field.fieldOptions().postTags(), boundaryScanner); } } } diff --git a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java index 8de58f062a..1220a76c12 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.vectorhighlight.BoundaryScanner; import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo; import org.apache.lucene.search.vectorhighlight.ScoreOrderFragmentsBuilder; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.lookup.SourceLookup; @@ -43,14 +42,11 @@ public class SourceScoreOrderFragmentsBuilder extends ScoreOrderFragmentsBuilder private final SearchContext searchContext; - private final FetchSubPhase.HitContext hitContext; - - public SourceScoreOrderFragmentsBuilder(FieldMapper mapper, SearchContext searchContext, - FetchSubPhase.HitContext hitContext, String[] preTags, String[] postTags, BoundaryScanner boundaryScanner) { + public SourceScoreOrderFragmentsBuilder(FieldMapper mapper, SearchContext searchContext, String[] preTags, String[] postTags, + BoundaryScanner boundaryScanner) { super(preTags, postTags, boundaryScanner); this.mapper = mapper; this.searchContext = searchContext; - this.hitContext = hitContext; } @Override diff --git a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java index b9fbd929f4..7ec6fe457d 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.lookup.SourceLookup; @@ -38,13 +37,10 @@ public class SourceSimpleFragmentsBuilder extends SimpleFragmentsBuilder { private final SearchContext searchContext; - private final FetchSubPhase.HitContext hitContext; - - public SourceSimpleFragmentsBuilder(FieldMapper mapper, SearchContext searchContext, - FetchSubPhase.HitContext hitContext, String[] preTags, String[] postTags, BoundaryScanner boundaryScanner) { + public SourceSimpleFragmentsBuilder(FieldMapper mapper, SearchContext searchContext, String[] preTags, String[] postTags, + BoundaryScanner boundaryScanner) { super(mapper, preTags, postTags, boundaryScanner); this.searchContext = searchContext; - this.hitContext = hitContext; } public static final Field[] EMPTY_FIELDS = new Field[0]; diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java index 45124dc8b5..93013b94b3 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java +++ b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java @@ -157,11 +157,4 @@ public class ShardSearchTransportRequest extends TransportRequest implements Sha public void rewrite(QueryShardContext context) throws IOException { shardSearchLocalRequest.rewrite(context); } - - private ShardSearchTransportRequest shallowCopy(ShardSearchLocalRequest rewritten) { - ShardSearchTransportRequest newRequest = new ShardSearchTransportRequest(); - newRequest.originalIndices = originalIndices; - newRequest.shardSearchLocalRequest = rewritten; - return newRequest; - } } diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java index 2d10a5b703..0c209e00a7 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java @@ -98,7 +98,6 @@ public final class CompletionSuggestion extends Suggest.Suggestion<CompletionSug // combine suggestion entries from participating shards on the coordinating node // the global top <code>size</code> entries are collected from the shard results // using a priority queue - Comparator<Suggest.Suggestion.Entry.Option> optionComparator = sortComparator(); OptionPriorityQueue priorityQueue = new OptionPriorityQueue(size, sortComparator()); for (Suggest.Suggestion<Entry> entries : toReduce) { assert entries.getEntries().size() == 1 : "CompletionSuggestion must have only one entry"; diff --git a/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java b/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java index 9768b9a855..a417fa8f10 100644 --- a/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java +++ b/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java @@ -177,7 +177,7 @@ public class StrictISODateTimeFormat { if (workingFields.contains(DateTimeFieldType.monthOfYear())) { reducedPrec = dateByMonth(bld, workingFields, extended, strictISO); } else if (workingFields.contains(DateTimeFieldType.dayOfYear())) { - reducedPrec = dateByOrdinal(bld, workingFields, extended, strictISO); + reducedPrec = dateByOrdinal(bld, workingFields, extended); } else if (workingFields.contains(DateTimeFieldType.weekOfWeekyear())) { reducedPrec = dateByWeek(bld, workingFields, extended, strictISO); } else if (workingFields.contains(DateTimeFieldType.dayOfMonth())) { @@ -288,14 +288,12 @@ public class StrictISODateTimeFormat { * @param bld the builder * @param fields the fields * @param extended true to use extended format - * @param strictISO true to only allow ISO formats * @since 1.1 */ private static boolean dateByOrdinal( DateTimeFormatterBuilder bld, Collection<DateTimeFieldType> fields, - boolean extended, - boolean strictISO) { + boolean extended) { boolean reducedPrec = false; if (fields.remove(DateTimeFieldType.year())) { |