From 4f14af21c5b9213e4b1add84d6d880eb20451e7d Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Tue, 28 Apr 2015 22:41:15 +0200 Subject: [PATCH 1/2] Remove ElasticsearchIAE and ElasticsearchISE This commit removes ElasticsearchIAE and ElasticsearchISE in favor of the JDKs IAE and ISE. Closes #10794 --- .../lucene/analysis/PrefixAnalyzer.java | 4 +- .../lucene/store/StoreRateLimiting.java | 8 +-- ...ElasticsearchIllegalArgumentException.java | 45 ------------- .../ElasticsearchIllegalStateException.java | 38 ----------- src/main/java/org/elasticsearch/Version.java | 4 +- .../elasticsearch/action/ActionFuture.java | 10 +-- .../ActionRequestValidationException.java | 8 ++- .../elasticsearch/action/ThreadingModel.java | 4 +- .../action/WriteConsistencyLevel.java | 6 +- .../cluster/health/ClusterHealthStatus.java | 4 +- .../health/TransportClusterHealthAction.java | 4 +- .../put/PutRepositoryRequest.java | 12 ++-- .../shards/ClusterSearchShardsRequest.java | 6 +- .../create/CreateSnapshotRequest.java | 12 ++-- .../restore/RestoreSnapshotRequest.java | 24 +++---- .../status/SnapshotIndexShardStage.java | 4 +- .../status/SnapshotIndexShardStatus.java | 4 +- .../snapshots/status/SnapshotShardsStats.java | 4 +- .../TransportSnapshotsStatusAction.java | 6 +- .../action/admin/indices/alias/Alias.java | 4 +- .../analyze/TransportAnalyzeAction.java | 27 ++++---- .../indices/create/CreateIndexRequest.java | 4 +- .../admin/indices/get/GetIndexRequest.java | 12 ++-- .../indices/get/TransportGetIndexAction.java | 4 +- .../mapping/put/PutMappingRequest.java | 10 +-- .../template/put/PutIndexTemplateRequest.java | 16 ++--- .../action/bulk/BulkProcessor.java | 4 +- .../action/bulk/BulkRequest.java | 6 +- .../action/bulk/TransportShardBulkAction.java | 8 +-- .../action/count/CountRequest.java | 4 +- .../action/delete/TransportDeleteAction.java | 4 +- .../TransportFieldStatsTransportAction.java | 8 +-- .../action/get/MultiGetRequest.java | 8 +-- .../action/index/IndexRequest.java | 16 ++--- .../action/mlt/MoreLikeThisRequest.java | 4 +- .../mlt/MoreLikeThisRequestBuilder.java | 4 +- .../mlt/TransportMoreLikeThisAction.java | 4 +- .../percolate/MultiPercolateRequest.java | 7 +- .../action/search/MultiSearchRequest.java | 7 +- .../action/search/SearchRequest.java | 8 +-- .../action/search/SearchRequestBuilder.java | 4 +- .../action/search/SearchType.java | 8 +-- .../action/search/TransportSearchAction.java | 4 +- .../search/TransportSearchScrollAction.java | 4 +- .../search/type/TransportSearchHelper.java | 14 ++-- .../type/TransportSearchTypeAction.java | 4 +- .../suggest/TransportSuggestAction.java | 4 +- .../action/support/AdapterActionFuture.java | 12 ++-- .../action/support/DestructiveOperations.java | 8 +-- .../action/support/IndicesOptions.java | 8 +-- .../termvectors/MultiTermVectorsRequest.java | 6 +- .../termvectors/TermVectorsResponse.java | 4 +- .../action/update/TransportUpdateAction.java | 4 +- .../action/update/UpdateHelper.java | 6 +- .../cache/recycler/PageCacheRecycler.java | 4 +- .../TransportClientNodesService.java | 6 +- .../elasticsearch/cluster/ClusterService.java | 6 +- .../elasticsearch/cluster/ClusterState.java | 8 +-- .../action/index/MappingUpdatedAction.java | 4 +- .../cluster/block/ClusterBlockLevel.java | 4 +- .../cluster/metadata/AliasAction.java | 4 +- .../cluster/metadata/AliasValidator.java | 26 ++++---- .../cluster/metadata/IndexMetaData.java | 14 ++-- .../cluster/metadata/MappingMetaData.java | 4 +- .../cluster/metadata/MetaData.java | 30 ++++----- .../metadata/MetaDataCreateIndexService.java | 14 ++-- .../metadata/MetaDataIndexStateService.java | 6 +- .../MetaDataIndexTemplateService.java | 6 +- .../MetaDataUpdateSettingsService.java | 8 +-- .../cluster/metadata/RestoreMetaData.java | 4 +- .../cluster/metadata/SnapshotMetaData.java | 4 +- .../cluster/node/DiscoveryNode.java | 4 +- .../cluster/node/DiscoveryNodes.java | 8 +-- .../cluster/routing/IndexRoutingTable.java | 6 +- .../cluster/routing/OperationRouting.java | 8 +-- .../cluster/routing/Preference.java | 4 +- .../cluster/routing/RoutingNode.java | 4 +- .../cluster/routing/ShardRoutingState.java | 4 +- .../routing/allocation/AllocationService.java | 5 +- .../allocator/BalancedShardsAllocator.java | 6 +- .../command/AllocateAllocationCommand.java | 14 ++-- .../command/AllocationCommands.java | 6 +- .../command/CancelAllocationCommand.java | 8 +-- .../command/MoveAllocationCommand.java | 8 +-- .../ClusterRebalanceAllocationDecider.java | 12 ++-- .../routing/allocation/decider/Decision.java | 6 +- .../decider/EnableAllocationDecider.java | 12 ++-- .../service/InternalClusterService.java | 10 +-- .../org/elasticsearch/common/Booleans.java | 4 +- .../org/elasticsearch/common/ParseField.java | 4 +- .../org/elasticsearch/common/PidFile.java | 6 +- .../elasticsearch/common/Preconditions.java | 28 ++++---- .../org/elasticsearch/common/Priority.java | 4 +- .../common/RandomBasedUUIDGenerator.java | 4 +- .../java/org/elasticsearch/common/Table.java | 14 ++-- .../common/TimeBasedUUIDGenerator.java | 6 +- .../common/breaker/CircuitBreaker.java | 4 +- .../common/bytes/BytesArray.java | 4 +- .../common/bytes/PagedBytesReference.java | 4 +- .../org/elasticsearch/common/cli/CliTool.java | 4 +- .../common/collect/HppcMaps.java | 6 +- .../common/component/Lifecycle.java | 34 +++++----- .../elasticsearch/common/geo/GeoDistance.java | 4 +- .../common/geo/GeoHashUtils.java | 6 +- .../common/geo/builders/ShapeBuilder.java | 6 +- .../elasticsearch/common/lucene/Lucene.java | 18 +++--- .../common/lucene/all/AllEntries.java | 4 +- .../common/lucene/docset/DocIdSets.java | 8 +-- .../lucene/index/FilterableTermsEnum.java | 4 +- .../search/function/WeightFactorFunction.java | 4 +- .../common/recycler/DequeRecycler.java | 4 +- .../common/recycler/NoneRecycler.java | 4 +- .../common/recycler/Recyclers.java | 6 +- .../org/elasticsearch/common/regex/Regex.java | 4 +- .../common/rounding/TimeZoneRounding.java | 6 +- .../common/settings/ImmutableSettings.java | 8 +-- .../TransportAddressSerializers.java | 4 +- .../common/unit/ByteSizeValue.java | 6 +- .../common/unit/DistanceUnit.java | 8 +-- .../elasticsearch/common/unit/Fuzziness.java | 6 +- .../common/util/BloomFilter.java | 4 +- .../common/util/LocaleUtils.java | 4 +- .../common/util/MultiDataPathUpgrader.java | 4 +- .../common/util/concurrent/CountDown.java | 4 +- .../common/util/concurrent/EsAbortPolicy.java | 6 +- .../util/concurrent/EsThreadPoolExecutor.java | 5 +- .../common/util/concurrent/KeyedLock.java | 8 +-- .../util/concurrent/SizeBlockingQueue.java | 6 +- .../UncategorizedExecutionException.java | 4 -- .../common/xcontent/XContentFactory.java | 6 +- .../xcontent/json/JsonXContentParser.java | 6 +- .../discovery/DiscoverySettings.java | 4 +- .../discovery/local/LocalDiscovery.java | 6 +- .../discovery/zen/NotMasterException.java | 12 +--- .../discovery/zen/ZenDiscovery.java | 16 ++--- .../zen/fd/MasterFaultDetection.java | 8 +-- .../discovery/zen/fd/NodesFaultDetection.java | 6 +- .../discovery/zen/ping/ZenPingService.java | 4 +- .../zen/ping/multicast/MulticastZenPing.java | 6 +- .../zen/ping/unicast/UnicastZenPing.java | 8 +-- .../elasticsearch/env/NodeEnvironment.java | 20 +++--- .../gateway/GatewayMetaState.java | 8 +-- .../gateway/MetaDataStateFormat.java | 4 +- .../elasticsearch/index/IndexException.java | 2 +- .../org/elasticsearch/index/IndexService.java | 4 +- .../org/elasticsearch/index/VersionType.java | 6 +- .../index/analysis/Analysis.java | 16 ++--- .../index/analysis/AnalysisModule.java | 18 +++--- .../index/analysis/AnalysisService.java | 6 +- .../analysis/ChineseAnalyzerProvider.java | 2 - .../CommonGramsTokenFilterFactory.java | 4 +- .../analysis/EdgeNGramTokenizerFactory.java | 8 +-- .../analysis/HunspellTokenFilterFactory.java | 6 +- .../analysis/KeepTypesFilterFactory.java | 4 +- .../index/analysis/KeepWordFilterFactory.java | 6 +- .../KeywordMarkerTokenFilterFactory.java | 4 +- .../analysis/LengthTokenFilterFactory.java | 4 +- .../analysis/LowerCaseTokenFilterFactory.java | 4 +- .../analysis/MappingCharFilterFactory.java | 4 +- .../index/analysis/NGramTokenizerFactory.java | 7 +- .../PathHierarchyTokenizerFactory.java | 6 +- .../analysis/PatternAnalyzerProvider.java | 4 +- ...PatternCaptureGroupTokenFilterFactory.java | 4 +- .../PatternReplaceCharFilterFactory.java | 4 +- .../PatternReplaceTokenFilterFactory.java | 4 +- .../analysis/PatternTokenizerFactory.java | 5 +- .../StemmerOverrideTokenFilterFactory.java | 4 +- .../analysis/StopTokenFilterFactory.java | 4 +- .../analysis/SynonymTokenFilterFactory.java | 9 ++- .../analysis/TrimTokenFilterFactory.java | 4 +- .../analysis/TruncateTokenFilterFactory.java | 4 +- ...bstractCompoundWordTokenFilterFactory.java | 4 +- ...enationCompoundWordTokenFilterFactory.java | 8 +-- .../index/codec/CodecService.java | 6 +- .../elasticsearch/index/engine/Engine.java | 6 +- .../index/engine/EngineSearcher.java | 7 +- .../fielddata/IndexFieldDataService.java | 8 +-- .../fielddata/IndexNumericFieldData.java | 4 +- .../plain/AbstractIndexGeoPointFieldData.java | 4 +- .../plain/BinaryDVAtomicFieldData.java | 4 +- .../plain/BinaryDVNumericIndexFieldData.java | 8 +-- .../plain/BytesBinaryDVIndexFieldData.java | 8 +-- .../plain/DisabledIndexFieldData.java | 8 +-- .../plain/DocValuesIndexFieldData.java | 4 +- .../plain/GeoPointBinaryDVIndexFieldData.java | 8 +-- .../plain/NumericDVIndexFieldData.java | 4 +- .../plain/ParentChildIndexFieldData.java | 4 +- .../plain/SortedNumericDVIndexFieldData.java | 8 +-- .../SortedSetDVBytesAtomicFieldData.java | 4 +- .../index/get/ShardGetService.java | 6 +- .../index/mapper/DocumentMapper.java | 4 +- .../index/mapper/DocumentParser.java | 5 +- .../index/mapper/MapperService.java | 4 +- .../index/mapper/ParseContext.java | 10 +-- .../mapper/core/AbstractFieldMapper.java | 4 +- .../index/mapper/core/BooleanFieldMapper.java | 4 +- .../index/mapper/core/ByteFieldMapper.java | 4 +- .../mapper/core/CompletionFieldMapper.java | 20 +++--- .../index/mapper/core/DateFieldMapper.java | 4 +- .../index/mapper/core/DoubleFieldMapper.java | 4 +- .../index/mapper/core/FloatFieldMapper.java | 4 +- .../index/mapper/core/IntegerFieldMapper.java | 4 +- .../index/mapper/core/LongFieldMapper.java | 4 +- .../index/mapper/core/NumberFieldMapper.java | 4 +- .../index/mapper/core/ShortFieldMapper.java | 4 +- .../index/mapper/core/StringFieldMapper.java | 4 +- .../index/mapper/geo/GeoPointFieldMapper.java | 10 +-- .../index/mapper/geo/GeoShapeFieldMapper.java | 6 +- .../internal/FieldNamesFieldMapper.java | 4 +- .../index/mapper/ip/IpFieldMapper.java | 16 ++--- .../index/mapper/object/DynamicTemplate.java | 4 +- .../index/mapper/object/ObjectMapper.java | 2 +- .../policy/AbstractMergePolicyProvider.java | 6 +- .../index/query/BoostingQueryBuilder.java | 8 +-- .../index/query/CommonTermsQueryBuilder.java | 6 +- .../index/query/CommonTermsQueryParser.java | 4 +- .../query/GeoBoundingBoxFilterBuilder.java | 10 +-- .../index/query/GeoShapeQueryParser.java | 4 +- .../index/query/GeohashCellFilter.java | 4 +- .../index/query/MoreLikeThisQueryBuilder.java | 4 +- .../index/query/MoreLikeThisQueryParser.java | 10 +-- .../elasticsearch/index/query/RegexpFlag.java | 4 +- .../index/query/ScriptFilterParser.java | 4 +- .../index/query/SimpleQueryStringFlag.java | 4 +- .../index/query/SpanNearQueryBuilder.java | 6 +- .../index/query/SpanNotQueryBuilder.java | 8 +-- .../index/query/SpanOrQueryBuilder.java | 4 +- .../index/query/TemplateQueryBuilder.java | 4 +- .../functionscore/DecayFunctionBuilder.java | 4 +- .../functionscore/DecayFunctionParser.java | 8 +-- .../FunctionScoreQueryBuilder.java | 9 ++- .../functionscore/factor/FactorBuilder.java | 4 +- .../support/InnerHitsQueryParserHelper.java | 8 +-- .../index/query/support/QueryParsers.java | 12 +--- .../index/search/MatchQuery.java | 8 +-- .../index/search/MultiMatchQuery.java | 4 +- .../index/search/child/ScoreType.java | 4 +- .../index/search/child/TopChildrenQuery.java | 4 +- .../index/search/geo/GeoDistanceFilter.java | 4 +- .../search/geo/GeoDistanceRangeFilter.java | 4 +- .../geo/IndexedGeoBoundingBoxFilter.java | 4 +- .../index/search/shape/ShapeFetchService.java | 8 +-- .../elasticsearch/index/shard/IndexShard.java | 8 +-- .../index/shard/IndexShardState.java | 6 +- .../index/shard/ShadowIndexShard.java | 4 +- .../elasticsearch/index/shard/ShardPath.java | 6 +- .../shard/TranslogRecoveryPerformer.java | 5 +- .../AbstractSimilarityProvider.java | 4 +- .../similarity/DFRSimilarityProvider.java | 6 +- .../similarity/IBSimilarityProvider.java | 6 +- .../index/similarity/SimilarityModule.java | 4 +- .../org/elasticsearch/index/store/Store.java | 10 +-- .../index/translog/Translog.java | 10 +-- .../index/translog/fs/FsTranslogFile.java | 6 +- .../elasticsearch/indices/IndicesService.java | 18 +++--- .../HierarchyCircuitBreakerService.java | 8 +-- .../cache/filter/IndicesFilterCache.java | 8 +-- .../cache/query/IndicesQueryCache.java | 4 +- .../cluster/IndicesClusterStateService.java | 6 +- .../cache/IndicesFieldDataCache.java | 4 +- .../indices/recovery/RecoveryState.java | 16 ++--- .../SharedFSRecoverySourceHandler.java | 4 +- .../elasticsearch/monitor/jvm/HotThreads.java | 4 +- .../java/org/elasticsearch/node/Node.java | 4 +- .../percolator/PercolatorService.java | 8 +-- .../elasticsearch/plugins/PluginManager.java | 16 ++--- .../elasticsearch/plugins/PluginsService.java | 6 +- .../repositories/RepositoriesService.java | 7 +- .../blobstore/BlobStoreRepository.java | 1 - .../elasticsearch/rest/BaseRestHandler.java | 6 -- .../elasticsearch/rest/RestController.java | 8 +-- .../org/elasticsearch/rest/RestRequest.java | 8 +-- .../alias/RestIndicesAliasesAction.java | 6 +- .../alias/put/RestIndexPutAliasAction.java | 4 +- .../indices/analyze/RestAnalyzeAction.java | 16 ++--- .../indices/get/RestGetIndicesAction.java | 4 +- .../rest/action/count/RestCountAction.java | 4 +- .../action/explain/RestExplainAction.java | 5 +- .../rest/action/index/RestIndexAction.java | 4 +- .../script/RestPutIndexedScriptAction.java | 4 +- .../action/search/RestClearScrollAction.java | 13 ++-- .../rest/action/search/RestSearchAction.java | 6 +- .../action/search/RestSearchScrollAction.java | 11 ++-- .../action/suggest/RestSuggestAction.java | 4 +- .../rest/action/support/RestActions.java | 4 +- .../script/NativeScriptEngineService.java | 4 +- .../java/org/elasticsearch/script/Script.java | 6 +- .../elasticsearch/script/ScriptContext.java | 6 +- .../script/ScriptContextRegistry.java | 8 +-- .../org/elasticsearch/script/ScriptMode.java | 4 +- .../org/elasticsearch/script/ScriptModes.java | 4 +- .../elasticsearch/script/ScriptModule.java | 4 +- .../elasticsearch/script/ScriptService.java | 48 +++++++------- .../script/expression/ExpressionScript.java | 4 +- .../elasticsearch/search/MultiValueMode.java | 10 +-- .../elasticsearch/search/SearchService.java | 4 +- .../aggregations/AggregatorFactories.java | 4 +- .../aggregations/InternalAggregations.java | 4 +- .../InternalMultiBucketAggregation.java | 8 +-- .../bucket/BestBucketsDeferringCollector.java | 14 ++-- .../bucket/BestDocsDeferringCollector.java | 6 +- .../bucket/DeferringBucketCollector.java | 8 +-- .../InternalSingleBucketAggregation.java | 6 +- .../children/ParentToChildrenAggregator.java | 4 +- .../bucket/geogrid/GeoHashGridBuilder.java | 4 +- .../bucket/global/GlobalAggregator.java | 4 +- .../bucket/histogram/InternalHistogram.java | 6 +- ...DiversifiedBytesHashSamplerAggregator.java | 4 +- .../DiversifiedMapSamplerAggregator.java | 4 +- .../DiversifiedNumericSamplerAggregator.java | 4 +- .../DiversifiedOrdinalsSamplerAggregator.java | 4 +- .../bucket/sampler/SamplerAggregator.java | 4 +- .../SignificantTermsAggregatorFactory.java | 5 +- .../significant/SignificantTermsBuilder.java | 14 ++-- .../significant/heuristics/JLHScore.java | 1 - .../heuristics/NXYSignificanceHeuristic.java | 8 +-- .../heuristics/SignificanceHeuristic.java | 8 +-- .../bucket/terms/InternalTerms.java | 4 +- .../bucket/terms/TermsAggregatorFactory.java | 5 +- .../bucket/terms/TermsBuilder.java | 18 +++--- .../bucket/terms/support/IncludeExclude.java | 4 +- .../InternalNumericMetricsAggregation.java | 6 +- .../metrics/geobounds/InternalGeoBounds.java | 10 +-- .../AbstractInternalPercentiles.java | 4 +- .../scripted/InternalScriptedMetric.java | 4 +- .../metrics/stats/StatsAggegator.java | 4 +- .../extended/ExtendedStatsAggregator.java | 4 +- .../metrics/tophits/InternalTopHits.java | 4 +- .../aggregations/support/AggregationPath.java | 14 ++-- .../support/format/ValueFormatterStreams.java | 4 +- .../search/builder/SearchSourceBuilder.java | 4 +- .../search/fetch/FetchPhase.java | 8 +-- .../FieldDataFieldsParseElement.java | 4 +- .../innerhits/InnerHitsParseElement.java | 28 ++++---- .../script/ScriptFieldsFetchSubPhase.java | 4 +- .../highlight/FastVectorHighlighter.java | 4 +- .../search/highlight/HighlightPhase.java | 7 +- .../highlight/HighlighterParseElement.java | 10 +-- .../search/highlight/PlainHighlighter.java | 4 +- .../search/highlight/PostingsHighlighter.java | 4 +- .../search/lookup/LeafDocLookup.java | 4 +- .../search/lookup/LeafFieldsLookup.java | 4 +- .../query/TerminateAfterParseElement.java | 4 +- .../search/rescore/QueryRescorer.java | 10 +-- .../search/rescore/RescoreParseElement.java | 6 +- .../search/sort/FieldSortBuilder.java | 4 +- .../search/sort/GeoDistanceSortParser.java | 6 +- .../search/sort/SortParseElement.java | 12 ++-- .../elasticsearch/search/suggest/Suggest.java | 8 +-- .../search/suggest/SuggestBuilder.java | 6 +- .../search/suggest/SuggestParseElement.java | 10 +-- .../search/suggest/SuggestUtils.java | 18 +++--- .../suggest/SuggestionSearchContext.java | 6 +- .../Completion090PostingsFormat.java | 4 +- .../completion/CompletionSuggestParser.java | 10 +-- .../phrase/DirectCandidateGenerator.java | 4 +- .../suggest/phrase/PhraseSuggestParser.java | 64 +++++++++---------- .../phrase/PhraseSuggestionBuilder.java | 8 +-- .../phrase/PhraseSuggestionContext.java | 4 +- .../search/suggest/phrase/WordScorer.java | 4 +- .../suggest/term/TermSuggestParser.java | 6 +- .../snapshots/SnapshotState.java | 4 +- .../elasticsearch/threadpool/ThreadPool.java | 8 +-- .../transport/PlainTransportFuture.java | 6 +- .../transport/RequestHandlerRegistry.java | 6 +- .../transport/TransportRequestOptions.java | 4 +- .../transport/TransportService.java | 4 +- .../netty/MessageChannelHandler.java | 4 +- .../transport/netty/NettyTransport.java | 12 ++-- .../watcher/ResourceWatcherService.java | 6 +- .../ElasticsearchExceptionTests.java | 15 +++-- .../java/org/elasticsearch/VersionTests.java | 2 +- .../indices/create/CreateIndexTests.java | 14 ++-- .../action/index/IndexRequestTests.java | 4 +- .../aliases/IndexAliasesTests.java | 22 +++---- .../BasicBackwardsCompatibilityTest.java | 4 +- .../UpdateSettingsValidationTests.java | 4 +- .../cluster/metadata/MetaDataTests.java | 8 +-- .../allocation/AllocationCommandsTests.java | 16 ++--- .../decider/DiskThresholdDeciderTests.java | 5 +- .../elasticsearch/common/BooleansTests.java | 4 +- .../elasticsearch/common/ParseFieldTests.java | 8 +-- .../elasticsearch/common/PidFileTests.java | 4 +- .../org/elasticsearch/common/TableTests.java | 16 ++--- .../collect/CopyOnWriteHashMapTests.java | 6 +- .../collect/CopyOnWriteHashSetTests.java | 4 +- .../common/geo/GeoJSONShapeParserTests.java | 7 +- .../recycler/AbstractRecyclerTests.java | 4 +- .../common/unit/SizeValueTests.java | 4 +- .../discovery/zen/ZenDiscoveryUnitTest.java | 4 +- .../env/NodeEnvironmentTests.java | 5 +- .../FieldStatsIntegrationTests.java | 4 +- .../gateway/MetaDataStateFormatTest.java | 8 +-- .../org/elasticsearch/get/GetActionTests.java | 5 +- .../analysis/KeepFilterFactoryTests.java | 6 +- .../analysis/NGramTokenizerFactoryTests.java | 6 +- .../PatternCaptureTokenFilterTests.java | 5 +- .../CommonGramsTokenFilterFactoryTests.java | 4 +- .../engine/InternalEngineSettingsTest.java | 8 +-- .../mapper/date/SimpleDateMappingTests.java | 4 +- .../index/mapper/ip/SimpleIpMappingTests.java | 12 ++-- .../merge/policy/MergePolicySettingsTest.java | 9 ++- .../query/SimpleIndexQueryParserTests.java | 6 +- .../index/search/child/ScoreTypeTests.java | 8 +-- .../index/shard/IndexShardTests.java | 8 +-- .../index/shard/ShardPathTests.java | 6 +- .../IndicesOptionsIntegrationTests.java | 4 +- .../indices/IndicesServiceTest.java | 8 +-- .../indices/analyze/AnalyzeActionTests.java | 10 +-- .../indices/recovery/RecoveryStateTest.java | 4 +- .../settings/UpdateNumberOfReplicasTests.java | 4 +- .../indices/settings/UpdateSettingsTests.java | 4 +- .../state/CloseIndexDisableCloseAllTests.java | 12 ++-- .../template/SimpleIndexTemplateTests.java | 13 ++-- ...DestructiveOperationsIntegrationTests.java | 19 +++--- .../plugins/PluginManagerTests.java | 12 ++-- .../routing/AliasResolveRoutingTests.java | 6 +- .../script/CustomScriptContextTests.java | 6 +- .../script/IndexedScriptTests.java | 2 +- .../script/ScriptContextRegistryTests.java | 12 ++-- .../script/ScriptModesTests.java | 4 +- .../script/ScriptServiceTests.java | 8 +-- .../SignificanceHeuristicTests.java | 30 ++++----- .../child/SimpleChildQuerySearchTests.java | 6 +- .../DecayFunctionScoreTests.java | 14 ++-- .../preference/SearchPreferenceTests.java | 5 +- .../search/scroll/SearchScrollTests.java | 14 ++-- .../search/simple/SimpleSearchTests.java | 8 +-- .../suggest/ContextSuggestSearchTests.java | 6 +- .../search/suggest/SuggestSearchTests.java | 12 ++-- .../SharedClusterSnapshotRestoreTests.java | 4 +- .../test/InternalTestCluster.java | 5 +- .../org/elasticsearch/test/TestCluster.java | 4 +- .../test/cluster/NoopClusterService.java | 6 +- .../test/cluster/TestClusterService.java | 6 +- .../transport/netty/KeyedLockTests.java | 8 +-- 436 files changed, 1502 insertions(+), 1665 deletions(-) delete mode 100644 src/main/java/org/elasticsearch/ElasticsearchIllegalArgumentException.java delete mode 100644 src/main/java/org/elasticsearch/ElasticsearchIllegalStateException.java diff --git a/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java b/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java index 8a8f1fce31d25..6e7c718769c54 100644 --- a/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java +++ b/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.io.IOException; import java.util.Collections; @@ -97,7 +97,7 @@ public PrefixTokenFilter(TokenStream input, char separator, Iterable extends Future { /** * Similar to {@link #get()}, just catching the {@link InterruptedException} and throwing - * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches + * an {@link IllegalStateException} instead. Also catches * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead. *

*

Note, the actual cause is unwrapped to the actual failure (for example, unwrapped @@ -46,7 +46,7 @@ public interface ActionFuture extends Future { /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing - * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches + * an {@link IllegalStateException} instead. Also catches * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead. *

*

Note, the actual cause is unwrapped to the actual failure (for example, unwrapped @@ -57,7 +57,7 @@ public interface ActionFuture extends Future { /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing - * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches + * an {@link IllegalStateException} instead. Also catches * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead. *

*

Note, the actual cause is unwrapped to the actual failure (for example, unwrapped @@ -70,7 +70,7 @@ public interface ActionFuture extends Future { /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing - * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches + * an {@link IllegalStateException} instead. Also catches * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead. *

*

Note, the actual cause is unwrapped to the actual failure (for example, unwrapped @@ -81,7 +81,7 @@ public interface ActionFuture extends Future { /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing - * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches + * an {@link IllegalStateException} instead. Also catches * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead. *

*

Note, the actual cause is unwrapped to the actual failure (for example, unwrapped diff --git a/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java index b353e75aa3b54..b4fd7c300595d 100644 --- a/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java +++ b/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java @@ -19,7 +19,9 @@ package org.elasticsearch.action; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import org.elasticsearch.ElasticsearchException; + +import java.lang.IllegalArgumentException; import java.util.ArrayList; import java.util.List; @@ -27,12 +29,12 @@ /** * */ -public class ActionRequestValidationException extends ElasticsearchIllegalArgumentException { +public class ActionRequestValidationException extends IllegalArgumentException { private final List validationErrors = new ArrayList<>(); public ActionRequestValidationException() { - super(null); + super("validation failed"); } public void addValidationError(String error) { diff --git a/src/main/java/org/elasticsearch/action/ThreadingModel.java b/src/main/java/org/elasticsearch/action/ThreadingModel.java index 5f87d82c528b6..f812a5c7777e0 100644 --- a/src/main/java/org/elasticsearch/action/ThreadingModel.java +++ b/src/main/java/org/elasticsearch/action/ThreadingModel.java @@ -19,7 +19,7 @@ package org.elasticsearch.action; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * @@ -108,7 +108,7 @@ public static ThreadingModel fromId(byte id) { } else if (id == 3) { return OPERATION_LISTENER; } else { - throw new ElasticsearchIllegalArgumentException("No threading model for [" + id + "]"); + throw new IllegalArgumentException("No threading model for [" + id + "]"); } } } diff --git a/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java b/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java index eeabdb99cb30c..1ce18498eabf7 100644 --- a/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java +++ b/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java @@ -19,7 +19,7 @@ package org.elasticsearch.action; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * Write Consistency Level control how many replicas should be active for a write operation to occur (a write operation @@ -53,7 +53,7 @@ public static WriteConsistencyLevel fromId(byte value) { } else if (value == 3) { return ALL; } - throw new ElasticsearchIllegalArgumentException("No write consistency match [" + value + "]"); + throw new IllegalArgumentException("No write consistency match [" + value + "]"); } public static WriteConsistencyLevel fromString(String value) { @@ -66,6 +66,6 @@ public static WriteConsistencyLevel fromString(String value) { } else if (value.equals("all")) { return ALL; } - throw new ElasticsearchIllegalArgumentException("No write consistency match [" + value + "]"); + throw new IllegalArgumentException("No write consistency match [" + value + "]"); } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java index 50479ee2df037..9a41708693fa3 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.health; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * @@ -48,7 +48,7 @@ public static ClusterHealthStatus fromValue(byte value) { case 2: return RED; default: - throw new ElasticsearchIllegalArgumentException("No cluster health status for value [" + value + "]"); + throw new IllegalArgumentException("No cluster health status for value [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index 9d5812a381036..fdcdcb0a97ae4 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.health; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; @@ -141,7 +141,7 @@ public void onNewClusterState(ClusterState clusterState) { @Override public void onClusterServiceClose() { - listener.onFailure(new ElasticsearchIllegalStateException("ClusterService was close during health call")); + listener.onFailure(new IllegalStateException("ClusterService was close during health call")); } @Override diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java index 8682ee1611ffd..cc7538ce1c572 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java @@ -20,8 +20,8 @@ package org.elasticsearch.action.admin.cluster.repositories.put; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.Version; +import java.lang.IllegalArgumentException; + import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.common.bytes.BytesReference; @@ -218,7 +218,7 @@ public PutRepositoryRequest source(Map repositoryDefinition) { type(entry.getValue().toString()); } else if (name.equals("settings")) { if (!(entry.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("Malformed settings section, should include an inner object"); + throw new IllegalArgumentException("Malformed settings section, should include an inner object"); } settings((Map) entry.getValue()); } @@ -236,7 +236,7 @@ public PutRepositoryRequest source(String repositoryDefinition) { try { return source(XContentFactory.xContent(repositoryDefinition).createParser(repositoryDefinition).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source [" + repositoryDefinition + "]", e); + throw new IllegalArgumentException("failed to parse repository source [" + repositoryDefinition + "]", e); } } @@ -260,7 +260,7 @@ public PutRepositoryRequest source(byte[] repositoryDefinition, int offset, int try { return source(XContentFactory.xContent(repositoryDefinition, offset, length).createParser(repositoryDefinition, offset, length).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source", e); + throw new IllegalArgumentException("failed to parse repository source", e); } } @@ -274,7 +274,7 @@ public PutRepositoryRequest source(BytesReference repositoryDefinition) { try { return source(XContentFactory.xContent(repositoryDefinition).createParser(repositoryDefinition).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse template source", e); + throw new IllegalArgumentException("failed to parse template source", e); } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java index b00878d367378..faf6101109c50 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.shards; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -61,11 +61,11 @@ public ActionRequestValidationException validate() { @Override public ClusterSearchShardsRequest indices(String... indices) { if (indices == null) { - throw new ElasticsearchIllegalArgumentException("indices must not be null"); + throw new IllegalArgumentException("indices must not be null"); } else { for (int i = 0; i < indices.length; i++) { if (indices[i] == null) { - throw new ElasticsearchIllegalArgumentException("indices[" + i + "] must not be null"); + throw new IllegalArgumentException("indices[" + i + "] must not be null"); } } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index 0bc0e75b4e5c7..ed8130ec66183 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.create; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -379,13 +379,13 @@ public CreateSnapshotRequest source(Map source) { } else if (entry.getValue() instanceof ArrayList) { indices((ArrayList) entry.getValue()); } else { - throw new ElasticsearchIllegalArgumentException("malformed indices section, should be an array of strings"); + throw new IllegalArgumentException("malformed indices section, should be an array of strings"); } } else if (name.equals("partial")) { partial(nodeBooleanValue(entry.getValue())); } else if (name.equals("settings")) { if (!(entry.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("malformed settings section, should indices an inner object"); + throw new IllegalArgumentException("malformed settings section, should indices an inner object"); } settings((Map) entry.getValue()); } else if (name.equals("include_global_state")) { @@ -407,7 +407,7 @@ public CreateSnapshotRequest source(String source) { try { return source(XContentFactory.xContent(source).createParser(source).mapOrderedAndClose()); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source [" + source + "]", e); + throw new IllegalArgumentException("failed to parse repository source [" + source + "]", e); } } return this; @@ -436,7 +436,7 @@ public CreateSnapshotRequest source(byte[] source, int offset, int length) { try { return source(XContentFactory.xContent(source, offset, length).createParser(source, offset, length).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source", e); + throw new IllegalArgumentException("failed to parse repository source", e); } } return this; @@ -452,7 +452,7 @@ public CreateSnapshotRequest source(BytesReference source) { try { return source(XContentFactory.xContent(source).createParser(source).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse snapshot source", e); + throw new IllegalArgumentException("failed to parse snapshot source", e); } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java index 27dd0672ca507..914331b33ef37 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.restore; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.IndicesOptions; @@ -493,7 +493,7 @@ public RestoreSnapshotRequest source(XContentBuilder source) { try { return source(source.bytes()); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("Failed to build json for repository request", e); + throw new IllegalArgumentException("Failed to build json for repository request", e); } } @@ -512,13 +512,13 @@ public RestoreSnapshotRequest source(Map source) { } else if (entry.getValue() instanceof ArrayList) { indices((ArrayList) entry.getValue()); } else { - throw new ElasticsearchIllegalArgumentException("malformed indices section, should be an array of strings"); + throw new IllegalArgumentException("malformed indices section, should be an array of strings"); } } else if (name.equals("partial")) { partial(nodeBooleanValue(entry.getValue())); } else if (name.equals("settings")) { if (!(entry.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("malformed settings section"); + throw new IllegalArgumentException("malformed settings section"); } settings((Map) entry.getValue()); } else if (name.equals("include_global_state")) { @@ -529,17 +529,17 @@ public RestoreSnapshotRequest source(Map source) { if (entry.getValue() instanceof String) { renamePattern((String) entry.getValue()); } else { - throw new ElasticsearchIllegalArgumentException("malformed rename_pattern"); + throw new IllegalArgumentException("malformed rename_pattern"); } } else if (name.equals("rename_replacement")) { if (entry.getValue() instanceof String) { renameReplacement((String) entry.getValue()); } else { - throw new ElasticsearchIllegalArgumentException("malformed rename_replacement"); + throw new IllegalArgumentException("malformed rename_replacement"); } } else if (name.equals("index_settings")) { if (!(entry.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("malformed index_settings section"); + throw new IllegalArgumentException("malformed index_settings section"); } indexSettings((Map) entry.getValue()); } else if (name.equals("ignore_index_settings")) { @@ -548,10 +548,10 @@ public RestoreSnapshotRequest source(Map source) { } else if (entry.getValue() instanceof List) { ignoreIndexSettings((List) entry.getValue()); } else { - throw new ElasticsearchIllegalArgumentException("malformed ignore_index_settings section, should be an array of strings"); + throw new IllegalArgumentException("malformed ignore_index_settings section, should be an array of strings"); } } else { - throw new ElasticsearchIllegalArgumentException("Unknown parameter " + name); + throw new IllegalArgumentException("Unknown parameter " + name); } } indicesOptions(IndicesOptions.fromMap((Map) source, IndicesOptions.lenientExpandOpen())); @@ -571,7 +571,7 @@ public RestoreSnapshotRequest source(String source) { try { return source(XContentFactory.xContent(source).createParser(source).mapOrderedAndClose()); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source [" + source + "]", e); + throw new IllegalArgumentException("failed to parse repository source [" + source + "]", e); } } return this; @@ -604,7 +604,7 @@ public RestoreSnapshotRequest source(byte[] source, int offset, int length) { try { return source(XContentFactory.xContent(source, offset, length).createParser(source, offset, length).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse repository source", e); + throw new IllegalArgumentException("failed to parse repository source", e); } } return this; @@ -622,7 +622,7 @@ public RestoreSnapshotRequest source(BytesReference source) { try { return source(XContentFactory.xContent(source).createParser(source).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse template source", e); + throw new IllegalArgumentException("failed to parse template source", e); } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java index 38be8b24d4285..8b3694531d342 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** */ @@ -92,7 +92,7 @@ public static SnapshotIndexShardStage fromValue(byte value) { case 4: return FAILURE; default: - throw new ElasticsearchIllegalArgumentException("No snapshot shard stage for value [" + value + "]"); + throw new IllegalArgumentException("No snapshot shard stage for value [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java index 4f2ee47e34461..44bb9a4163865 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -75,7 +75,7 @@ private SnapshotIndexShardStatus() { stage = SnapshotIndexShardStage.FAILURE; break; default: - throw new ElasticsearchIllegalArgumentException("Unknown stage type " + indexShardStatus.stage()); + throw new IllegalArgumentException("Unknown stage type " + indexShardStatus.stage()); } stats = new SnapshotStats(indexShardStatus); failure = indexShardStatus.failure(); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java index 8eb9b35b040e2..6fdbaa5edd927 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilderString; @@ -59,7 +59,7 @@ public class SnapshotShardsStats implements ToXContent { failedShards++; break; default: - throw new ElasticsearchIllegalArgumentException("Unknown stage type " + shard.getStage()); + throw new IllegalArgumentException("Unknown stage type " + shard.getStage()); } } } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java index 7ccf3396236b5..d3bcbcf53049e 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; @@ -180,7 +180,7 @@ private SnapshotsStatusResponse buildResponse(SnapshotsStatusRequest request, Im stage = SnapshotIndexShardStage.DONE; break; default: - throw new ElasticsearchIllegalArgumentException("Unknown snapshot state " + shardEntry.getValue().state()); + throw new IllegalArgumentException("Unknown snapshot state " + shardEntry.getValue().state()); } SnapshotIndexShardStatus shardStatus = new SnapshotIndexShardStatus(shardEntry.getKey(), stage); shardStatusBuilder.add(shardStatus); @@ -216,7 +216,7 @@ private SnapshotsStatusResponse buildResponse(SnapshotsStatusRequest request, Im state = SnapshotMetaData.State.SUCCESS; break; default: - throw new ElasticsearchIllegalArgumentException("Unknown snapshot state " + snapshot.state()); + throw new IllegalArgumentException("Unknown snapshot state " + snapshot.state()); } builder.add(new SnapshotStatus(snapshotId, state, shardStatusBuilder.build())); } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java index bd5934dbfbdb3..b782868b577e1 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.alias; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -187,7 +187,7 @@ public static Alias fromXContent(XContentParser parser) throws IOException { String currentFieldName = null; XContentParser.Token token = parser.nextToken(); if (token == null) { - throw new ElasticsearchIllegalArgumentException("No alias is specified"); + throw new IllegalArgumentException("No alias is specified"); } while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token == XContentParser.Token.FIELD_NAME) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java index 7cdb026e9fb82..0b9c6e6b186ee 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java @@ -26,9 +26,8 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; -import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.single.custom.TransportSingleCustomOperationAction; import org.elasticsearch.cluster.ClusterService; @@ -108,12 +107,12 @@ protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId String field = null; if (request.field() != null) { if (indexService == null) { - throw new ElasticsearchIllegalArgumentException("No index provided, and trying to analyzer based on a specific field which requires the index parameter"); + throw new IllegalArgumentException("No index provided, and trying to analyzer based on a specific field which requires the index parameter"); } FieldMapper fieldMapper = indexService.mapperService().smartNameFieldMapper(request.field()); if (fieldMapper != null) { if (fieldMapper.isNumeric()) { - throw new ElasticsearchIllegalArgumentException("Can't process field [" + request.field() + "], Analysis requests are not supported on numeric fields"); + throw new IllegalArgumentException("Can't process field [" + request.field() + "], Analysis requests are not supported on numeric fields"); } analyzer = fieldMapper.indexAnalyzer(); field = fieldMapper.names().indexName(); @@ -134,20 +133,20 @@ protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId analyzer = indexService.analysisService().analyzer(request.analyzer()); } if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("failed to find analyzer [" + request.analyzer() + "]"); + throw new IllegalArgumentException("failed to find analyzer [" + request.analyzer() + "]"); } } else if (request.tokenizer() != null) { TokenizerFactory tokenizerFactory; if (indexService == null) { TokenizerFactoryFactory tokenizerFactoryFactory = indicesAnalysisService.tokenizerFactoryFactory(request.tokenizer()); if (tokenizerFactoryFactory == null) { - throw new ElasticsearchIllegalArgumentException("failed to find global tokenizer under [" + request.tokenizer() + "]"); + throw new IllegalArgumentException("failed to find global tokenizer under [" + request.tokenizer() + "]"); } tokenizerFactory = tokenizerFactoryFactory.create(request.tokenizer(), DEFAULT_SETTINGS); } else { tokenizerFactory = indexService.analysisService().tokenizer(request.tokenizer()); if (tokenizerFactory == null) { - throw new ElasticsearchIllegalArgumentException("failed to find tokenizer under [" + request.tokenizer() + "]"); + throw new IllegalArgumentException("failed to find tokenizer under [" + request.tokenizer() + "]"); } } @@ -159,17 +158,17 @@ protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId if (indexService == null) { TokenFilterFactoryFactory tokenFilterFactoryFactory = indicesAnalysisService.tokenFilterFactoryFactory(tokenFilterName); if (tokenFilterFactoryFactory == null) { - throw new ElasticsearchIllegalArgumentException("failed to find global token filter under [" + tokenFilterName + "]"); + throw new IllegalArgumentException("failed to find global token filter under [" + tokenFilterName + "]"); } tokenFilterFactories[i] = tokenFilterFactoryFactory.create(tokenFilterName, DEFAULT_SETTINGS); } else { tokenFilterFactories[i] = indexService.analysisService().tokenFilter(tokenFilterName); if (tokenFilterFactories[i] == null) { - throw new ElasticsearchIllegalArgumentException("failed to find token filter under [" + tokenFilterName + "]"); + throw new IllegalArgumentException("failed to find token filter under [" + tokenFilterName + "]"); } } if (tokenFilterFactories[i] == null) { - throw new ElasticsearchIllegalArgumentException("failed to find token filter under [" + tokenFilterName + "]"); + throw new IllegalArgumentException("failed to find token filter under [" + tokenFilterName + "]"); } } } @@ -182,17 +181,17 @@ protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId if (indexService == null) { CharFilterFactoryFactory charFilterFactoryFactory = indicesAnalysisService.charFilterFactoryFactory(charFilterName); if (charFilterFactoryFactory == null) { - throw new ElasticsearchIllegalArgumentException("failed to find global char filter under [" + charFilterName + "]"); + throw new IllegalArgumentException("failed to find global char filter under [" + charFilterName + "]"); } charFilterFactories[i] = charFilterFactoryFactory.create(charFilterName, DEFAULT_SETTINGS); } else { charFilterFactories[i] = indexService.analysisService().charFilter(charFilterName); if (charFilterFactories[i] == null) { - throw new ElasticsearchIllegalArgumentException("failed to find token char under [" + charFilterName + "]"); + throw new IllegalArgumentException("failed to find token char under [" + charFilterName + "]"); } } if (charFilterFactories[i] == null) { - throw new ElasticsearchIllegalArgumentException("failed to find token char under [" + charFilterName + "]"); + throw new IllegalArgumentException("failed to find token char under [" + charFilterName + "]"); } } } @@ -207,7 +206,7 @@ protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId } } if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("failed to find analyzer"); + throw new IllegalArgumentException("failed to find analyzer"); } List tokens = Lists.newArrayList(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 0be9e2767c145..38782547440d1 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -22,7 +22,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; @@ -239,7 +239,7 @@ public CreateIndexRequest mapping(String type, XContentBuilder source) { try { mappings.put(type, source.string()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to build json for mapping request", e); + throw new IllegalArgumentException("Failed to build json for mapping request", e); } return this; } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java index 417744176becd..03ca578bedb96 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java @@ -21,7 +21,7 @@ import com.google.common.collect.ObjectArrays; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.info.ClusterInfoRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -74,18 +74,18 @@ public boolean validName(String name) { return this.validNames.contains(name); } - public static Feature fromName(String name) throws ElasticsearchIllegalArgumentException { + public static Feature fromName(String name) throws IllegalArgumentException { for (Feature feature : Feature.values()) { if (feature.validName(name)) { return feature; } } - throw new ElasticsearchIllegalArgumentException("No feature for name [" + name + "]"); + throw new IllegalArgumentException("No feature for name [" + name + "]"); } - public static Feature fromId(byte id) throws ElasticsearchIllegalArgumentException { + public static Feature fromId(byte id) throws IllegalArgumentException { if (id < 0 || id >= FEATURES.length) { - throw new ElasticsearchIllegalArgumentException("No mapping for id [" + id + "]"); + throw new IllegalArgumentException("No mapping for id [" + id + "]"); } return FEATURES[id]; } @@ -104,7 +104,7 @@ public static Feature[] convertToFeatures(String... featureNames) { public GetIndexRequest features(Feature... features) { if (features == null) { - throw new ElasticsearchIllegalArgumentException("features cannot be null"); + throw new IllegalArgumentException("features cannot be null"); } else { this.features = features; } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java index 096878c61f68f..4b47e95c2bc8b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature; import org.elasticsearch.action.support.ActionFilters; @@ -112,7 +112,7 @@ protected void doMasterOperation(final GetIndexRequest request, String[] concret break; default: - throw new ElasticsearchIllegalStateException("feature [" + feature + "] is not valid"); + throw new IllegalStateException("feature [" + feature + "] is not valid"); } } listener.onResponse(new GetIndexResponse(concreteIndices, warmersResult, mappingsResult, aliasesResult, settings)); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java index 7920faa67b2fd..b990a7e90b035 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java @@ -21,7 +21,7 @@ import com.carrotsearch.hppc.ObjectOpenHashSet; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -170,7 +170,7 @@ public static XContentBuilder buildFromSimplifiedDef(String type, Object... sour for (String s : s1) { String[] s2 = Strings.split(s, "="); if (s2.length != 2) { - throw new ElasticsearchIllegalArgumentException("malformed " + s); + throw new IllegalArgumentException("malformed " + s); } builder.field(s2[0], s2[1]); } @@ -190,7 +190,7 @@ public static XContentBuilder buildFromSimplifiedDef(String type, Object... sour for (String s : s1) { String[] s2 = Strings.split(s, "="); if (s2.length != 2) { - throw new ElasticsearchIllegalArgumentException("malformed " + s); + throw new IllegalArgumentException("malformed " + s); } builder.field(s2[0], s2[1]); } @@ -203,7 +203,7 @@ public static XContentBuilder buildFromSimplifiedDef(String type, Object... sour builder.endObject(); return builder; } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to generate simplified mapping definition", e); + throw new IllegalArgumentException("failed to generate simplified mapping definition", e); } } @@ -214,7 +214,7 @@ public PutMappingRequest source(XContentBuilder mappingBuilder) { try { return source(mappingBuilder.string()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to build json for mapping request", e); + throw new IllegalArgumentException("Failed to build json for mapping request", e); } } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java index b728abf934e0b..9d8619219f8d7 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.template.put; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -215,7 +215,7 @@ public PutIndexTemplateRequest mapping(String type, XContentBuilder source) { try { mappings.put(type, source.string()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to build json for mapping request", e); + throw new IllegalArgumentException("Failed to build json for mapping request", e); } return this; } @@ -260,7 +260,7 @@ public PutIndexTemplateRequest source(XContentBuilder templateBuilder) { try { return source(templateBuilder.bytes()); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("Failed to build json for template request", e); + throw new IllegalArgumentException("Failed to build json for template request", e); } } @@ -278,14 +278,14 @@ public PutIndexTemplateRequest source(Map templateSource) { order(XContentMapValues.nodeIntegerValue(entry.getValue(), order())); } else if (name.equals("settings")) { if (!(entry.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("Malformed settings section, should include an inner object"); + throw new IllegalArgumentException("Malformed settings section, should include an inner object"); } settings((Map) entry.getValue()); } else if (name.equals("mappings")) { Map mappings = (Map) entry.getValue(); for (Map.Entry entry1 : mappings.entrySet()) { if (!(entry1.getValue() instanceof Map)) { - throw new ElasticsearchIllegalArgumentException("Malformed mappings section for type [" + entry1.getKey() + "], should include an inner object describing the mapping"); + throw new IllegalArgumentException("Malformed mappings section for type [" + entry1.getKey() + "], should include an inner object describing the mapping"); } mapping(entry1.getKey(), (Map) entry1.getValue()); } @@ -313,7 +313,7 @@ public PutIndexTemplateRequest source(String templateSource) { try { return source(XContentFactory.xContent(templateSource).createParser(templateSource).mapOrderedAndClose()); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to parse template source [" + templateSource + "]", e); + throw new IllegalArgumentException("failed to parse template source [" + templateSource + "]", e); } } @@ -331,7 +331,7 @@ public PutIndexTemplateRequest source(byte[] source, int offset, int length) { try { return source(XContentFactory.xContent(source, offset, length).createParser(source, offset, length).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse template source", e); + throw new IllegalArgumentException("failed to parse template source", e); } } @@ -342,7 +342,7 @@ public PutIndexTemplateRequest source(BytesReference source) { try { return source(XContentFactory.xContent(source).createParser(source).mapOrderedAndClose()); } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("failed to parse template source", e); + throw new IllegalArgumentException("failed to parse template source", e); } } diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java b/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java index 9c6d1ac884254..607b7a69c6521 100644 --- a/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java +++ b/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.bulk; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.delete.DeleteRequest; @@ -271,7 +271,7 @@ boolean isOpen() { protected void ensureOpen() { if (closed) { - throw new ElasticsearchIllegalStateException("bulk process already closed"); + throw new IllegalStateException("bulk process already closed"); } } diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java index b6665160121ec..b0f12b5996e52 100644 --- a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java +++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.bulk; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.*; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; @@ -84,7 +84,7 @@ public BulkRequest add(ActionRequest request, @Nullable Object payload) { } else if (request instanceof UpdateRequest) { add((UpdateRequest) request, payload); } else { - throw new ElasticsearchIllegalArgumentException("No support for request [" + request + "]"); + throw new IllegalArgumentException("No support for request [" + request + "]"); } return this; } @@ -294,7 +294,7 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null } else if (token.isValue()) { if ("_index".equals(currentFieldName)) { if (!allowExplicitIndex) { - throw new ElasticsearchIllegalArgumentException("explicit index in bulk is not allowed"); + throw new IllegalArgumentException("explicit index in bulk is not allowed"); } index = parser.text(); } else if ("_type".equals(currentFieldName)) { diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java index 3a96f3aeff307..799c7c073b187 100644 --- a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java +++ b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.bulk; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionWriteResponse; @@ -292,7 +292,7 @@ protected Tuple shardOperationOnPrimary(Clu } } } else { - throw new ElasticsearchIllegalStateException("Unexpected index operation: " + item.request()); + throw new IllegalStateException("Unexpected index operation: " + item.request()); } assert item.getPrimaryResponse() != null; @@ -502,7 +502,7 @@ private UpdateResult shardUpdateOperation(ClusterState clusterState, BulkShardRe indexShard.indexingService().noopUpdate(updateRequest.type()); return new UpdateResult(translate, updateResponse); default: - throw new ElasticsearchIllegalStateException("Illegal update operation " + translate.operation()); + throw new IllegalStateException("Illegal update operation " + translate.operation()); } } @@ -556,7 +556,7 @@ protected void shardOperationOnReplica(ShardId shardId, BulkShardRequest request } } } else { - throw new ElasticsearchIllegalStateException("Unexpected index operation: " + item.request()); + throw new IllegalStateException("Unexpected index operation: " + item.request()); } } diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java index 7233d5ae7fce4..6ed17c8c11a0e 100644 --- a/src/main/java/org/elasticsearch/action/count/CountRequest.java +++ b/src/main/java/org/elasticsearch/action/count/CountRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.count; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; @@ -217,7 +217,7 @@ public String preference() { */ public CountRequest terminateAfter(int terminateAfterCount) { if (terminateAfterCount <= 0) { - throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0"); + throw new IllegalArgumentException("terminateAfter must be > 0"); } this.terminateAfter = terminateAfterCount; return this; diff --git a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java index 747a9aa8953be..47c8890616547 100644 --- a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java +++ b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.delete; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.RoutingMissingException; @@ -103,7 +103,7 @@ protected void resolveRequest(final ClusterState state, final InternalRequest re if (request.request().routing() == null) { if (request.request().versionType() != VersionType.INTERNAL) { // TODO: implement this feature - throw new ElasticsearchIllegalArgumentException("routing value is required for deleting documents of type [" + request.request().type() + throw new IllegalArgumentException("routing value is required for deleting documents of type [" + request.request().type() + "] while using version_type [" + request.request().versionType() + "]"); } throw new RoutingMissingException(request.concreteIndex(), request.request().type(), request.request().id()); diff --git a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java index 63be6434fe1e1..aa9d806c812cb 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java @@ -23,8 +23,8 @@ import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Terms; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.ActionFilters; @@ -87,7 +87,7 @@ protected FieldStatsResponse newResponse(FieldStatsRequest request, AtomicRefere indexName = shardResponse.getIndex(); } else { // should already have been catched by the FieldStatsRequest#validate(...) - throw new ElasticsearchIllegalArgumentException("Illegal level option [" + request.level() + "]"); + throw new IllegalArgumentException("Illegal level option [" + request.level() + "]"); } Map indexMergedFieldStats = indicesMergedFieldStats.get(indexName); @@ -100,7 +100,7 @@ protected FieldStatsResponse newResponse(FieldStatsRequest request, AtomicRefere FieldStats existing = indexMergedFieldStats.get(entry.getKey()); if (existing != null) { if (existing.getType() != entry.getValue().getType()) { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( "trying to merge the field stats of field [" + entry.getKey() + "] from index [" + shardResponse.getIndex() + "] but the field type is incompatible, try to set the 'level' option to 'indices'" ); } diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java index 74e76253ca215..e4c8c22d0bdfe 100644 --- a/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java +++ b/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.get; import com.google.common.collect.Iterators; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.action.support.IndicesOptions; @@ -376,7 +376,7 @@ public static void parseDocuments(XContentParser parser, List items, @Null XContentParser.Token token; while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("docs array element should include an object"); + throw new IllegalArgumentException("docs array element should include an object"); } String index = defaultIndex; String type = defaultType; @@ -395,7 +395,7 @@ public static void parseDocuments(XContentParser parser, List items, @Null } else if (token.isValue()) { if ("_index".equals(currentFieldName)) { if (!allowExplicitIndex) { - throw new ElasticsearchIllegalArgumentException("explicit index in multi get is not allowed"); + throw new IllegalArgumentException("explicit index in multi get is not allowed"); } index = parser.text(); } else if ("_type".equals(currentFieldName)) { @@ -486,7 +486,7 @@ public static void parseIds(XContentParser parser, List items, @Nullable S XContentParser.Token token; while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (!token.isValue()) { - throw new ElasticsearchIllegalArgumentException("ids array element should only contain ids"); + throw new IllegalArgumentException("ids array element should only contain ids"); } items.add(new Item(defaultIndex, defaultType, parser.text()).fields(defaultFields).fetchSourceContext(defaultFetchSource).routing(defaultRouting)); } diff --git a/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/src/main/java/org/elasticsearch/action/index/IndexRequest.java index 5dcd790a42222..b8d3026feac3d 100644 --- a/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -22,7 +22,7 @@ import com.google.common.base.Charsets; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.action.support.replication.ShardReplicationOperationRequest; @@ -109,11 +109,11 @@ public static OpType fromId(byte id) { } else if (id == 1) { return CREATE; } else { - throw new ElasticsearchIllegalArgumentException("No type match for [" + id + "]"); + throw new IllegalArgumentException("No type match for [" + id + "]"); } } - public static OpType fromString(String sOpType) throws ElasticsearchIllegalArgumentException { + public static OpType fromString(String sOpType) throws IllegalArgumentException { String lowersOpType = sOpType.toLowerCase(Locale.ROOT); switch(lowersOpType){ case "create": @@ -121,7 +121,7 @@ public static OpType fromString(String sOpType) throws ElasticsearchIllegalArgum case "index": return OpType.INDEX; default: - throw new ElasticsearchIllegalArgumentException("opType [" + sOpType + "] not allowed, either [index] or [create] are allowed"); + throw new IllegalArgumentException("opType [" + sOpType + "] not allowed, either [index] or [create] are allowed"); } } @@ -326,7 +326,7 @@ public IndexRequest ttl(Long ttl) throws ElasticsearchGenerationException { return this; } if (ttl <= 0) { - throw new ElasticsearchIllegalArgumentException("TTL value must be > 0. Illegal value provided [" + ttl + "]"); + throw new IllegalArgumentException("TTL value must be > 0. Illegal value provided [" + ttl + "]"); } this.ttl = ttl; return this; @@ -490,7 +490,7 @@ public IndexRequest opType(OpType opType) { * Sets a string representation of the {@link #opType(org.elasticsearch.action.index.IndexRequest.OpType)}. Can * be either "index" or "create". */ - public IndexRequest opType(String opType) throws ElasticsearchIllegalArgumentException { + public IndexRequest opType(String opType) throws IllegalArgumentException { return opType(OpType.fromString(opType)); } @@ -608,11 +608,11 @@ public void process(MetaData metaData, @Nullable MappingMetaData mappingMd, bool } if (parent != null && !mappingMd.hasParentField()) { - throw new ElasticsearchIllegalArgumentException("Can't specify parent if no parent field has been configured"); + throw new IllegalArgumentException("Can't specify parent if no parent field has been configured"); } } else { if (parent != null) { - throw new ElasticsearchIllegalArgumentException("Can't specify parent if no parent field has been configured"); + throw new IllegalArgumentException("Can't specify parent if no parent field has been configured"); } } diff --git a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java index 202383dbf3c83..88be29f5de156 100644 --- a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java +++ b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.*; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchType; @@ -475,7 +475,7 @@ public MoreLikeThisRequest searchType(SearchType searchType) { /** * The search type of the mlt search query. */ - public MoreLikeThisRequest searchType(String searchType) throws ElasticsearchIllegalArgumentException { + public MoreLikeThisRequest searchType(String searchType) throws IllegalArgumentException { return searchType(SearchType.fromString(searchType)); } diff --git a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java index 5b10269f3c23a..de3d5d73f2d93 100644 --- a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.mlt; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -213,7 +213,7 @@ public MoreLikeThisRequestBuilder setSearchType(SearchType searchType) { /** * The search type of the mlt search query. */ - public MoreLikeThisRequestBuilder setSearchType(String searchType) throws ElasticsearchIllegalArgumentException { + public MoreLikeThisRequestBuilder setSearchType(String searchType) throws IllegalArgumentException { request.searchType(searchType); return this; } diff --git a/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java b/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java index d78745e366736..2c0fa335043bc 100644 --- a/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java +++ b/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; @@ -303,7 +303,7 @@ private Object convertField(Field field) { } else if (field.numericValue() != null) { return field.numericValue(); } else { - throw new ElasticsearchIllegalStateException("Field should have either a string, numeric or binary value"); + throw new IllegalStateException("Field should have either a string, numeric or binary value"); } } diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java b/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java index d998bba748d6e..4649a9f9b8b06 100644 --- a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java +++ b/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.percolate; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; @@ -27,7 +27,6 @@ import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -187,7 +186,7 @@ private void parsePercolateAction(XContentParser parser, PercolateRequest percol header.put("id", entry.getValue()); } else if ("index".equals(entry.getKey()) || "indices".equals(entry.getKey())) { if (!allowExplicitIndex) { - throw new ElasticsearchIllegalArgumentException("explicit index in multi percolate is not allowed"); + throw new IllegalArgumentException("explicit index in multi percolate is not allowed"); } getRequest.index(nodeStringValue(value, null)); } else if ("type".equals(entry.getKey())) { @@ -225,7 +224,7 @@ private void parsePercolateAction(XContentParser parser, PercolateRequest percol Object value = entry.getValue(); if ("index".equals(entry.getKey()) || "indices".equals(entry.getKey())) { if (!allowExplicitIndex) { - throw new ElasticsearchIllegalArgumentException("explicit index in multi percolate is not allowed"); + throw new IllegalArgumentException("explicit index in multi percolate is not allowed"); } percolateRequest.indices(nodeStringArrayValue(value)); } else if ("type".equals(entry.getKey())) { diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java index a27c4a590eeda..0208b519efee3 100644 --- a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java +++ b/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java @@ -20,15 +20,14 @@ package org.elasticsearch.action.search; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchParseException; +import java.lang.IllegalArgumentException; + import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -125,7 +124,7 @@ public MultiSearchRequest add(BytesReference data, @Nullable String[] indices, @ Object value = entry.getValue(); if ("index".equals(entry.getKey()) || "indices".equals(entry.getKey())) { if (!allowExplicitIndex) { - throw new ElasticsearchIllegalArgumentException("explicit index in multi percolate is not allowed"); + throw new IllegalArgumentException("explicit index in multi percolate is not allowed"); } searchRequest.indices(nodeStringArrayValue(value)); } else if ("type".equals(entry.getKey()) || "types".equals(entry.getKey())) { diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 1c16f3a8b354b..8fee22267c28a 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.search; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -152,11 +152,11 @@ public ActionRequestValidationException validate() { @Override public SearchRequest indices(String... indices) { if (indices == null) { - throw new ElasticsearchIllegalArgumentException("indices must not be null"); + throw new IllegalArgumentException("indices must not be null"); } else { for (int i = 0; i < indices.length; i++) { if (indices[i] == null) { - throw new ElasticsearchIllegalArgumentException("indices[" + i + "] must not be null"); + throw new IllegalArgumentException("indices[" + i + "] must not be null"); } } } @@ -241,7 +241,7 @@ public SearchRequest searchType(SearchType searchType) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", and "query_and_fetch"/"queryAndFetch". */ - public SearchRequest searchType(String searchType) throws ElasticsearchIllegalArgumentException { + public SearchRequest searchType(String searchType) throws IllegalArgumentException { return searchType(SearchType.fromString(searchType)); } diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index e51bbb6234ffc..0ea1b41a5dd80 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.search; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequestBuilder; @@ -86,7 +86,7 @@ public SearchRequestBuilder setSearchType(SearchType searchType) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", and "query_and_fetch"/"queryAndFetch". */ - public SearchRequestBuilder setSearchType(String searchType) throws ElasticsearchIllegalArgumentException { + public SearchRequestBuilder setSearchType(String searchType) throws IllegalArgumentException { request.searchType(searchType); return this; } diff --git a/src/main/java/org/elasticsearch/action/search/SearchType.java b/src/main/java/org/elasticsearch/action/search/SearchType.java index 8d454914926a0..543ffe614234c 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchType.java +++ b/src/main/java/org/elasticsearch/action/search/SearchType.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.search; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; /** @@ -100,7 +100,7 @@ public static SearchType fromId(byte id) { } else if (id == 5) { return COUNT; } else { - throw new ElasticsearchIllegalArgumentException("No search type for [" + id + "]"); + throw new IllegalArgumentException("No search type for [" + id + "]"); } } @@ -109,7 +109,7 @@ public static SearchType fromId(byte id) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", "query_and_fetch"/"queryAndFetch", and "scan". */ - public static SearchType fromString(String searchType) throws ElasticsearchIllegalArgumentException { + public static SearchType fromString(String searchType) throws IllegalArgumentException { if (searchType == null) { return SearchType.DEFAULT; } @@ -126,7 +126,7 @@ public static SearchType fromString(String searchType) throws ElasticsearchIlleg } else if (COUNT_VALUE.match(searchType)) { return SearchType.COUNT; } else { - throw new ElasticsearchIllegalArgumentException("No search type for [" + searchType + "]"); + throw new IllegalArgumentException("No search type for [" + searchType + "]"); } } } diff --git a/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index 112b0e27d1cd8..ade70551844a9 100644 --- a/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.search; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.type.*; import org.elasticsearch.action.support.ActionFilters; @@ -106,7 +106,7 @@ protected void doExecute(SearchRequest searchRequest, ActionListener[] context = new Tuple[contextSize]; @@ -110,7 +110,7 @@ public static ParsedScrollId parseScrollId(String scrollId) { String element = elements[index++]; int sep = element.indexOf(':'); if (sep == -1) { - throw new ElasticsearchIllegalArgumentException("Malformed scrollId [" + scrollId + "]"); + throw new IllegalArgumentException("Malformed scrollId [" + scrollId + "]"); } context[i] = new Tuple<>(element.substring(sep + 1), Long.parseLong(element.substring(0, sep))); } diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java index 189b035a918e5..f2d6340fd4056 100644 --- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java +++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.NoShardAvailableActionException; import org.elasticsearch.action.search.ReduceSearchPhaseException; @@ -194,7 +194,7 @@ void onFirstPhaseResult(int shardIndex, ShardRouting shard, FirstResult result, raiseEarlyFailure(new ReduceSearchPhaseException(firstPhaseName(), "", e, buildShardFailures())); } } else if (xTotalOps > expectedTotalOps) { - raiseEarlyFailure(new ElasticsearchIllegalStateException("unexpected higher total ops [" + xTotalOps + "] compared to expected [" + expectedTotalOps + "]")); + raiseEarlyFailure(new IllegalStateException("unexpected higher total ops [" + xTotalOps + "] compared to expected [" + expectedTotalOps + "]")); } } diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java index 237dd64ee318a..2054cad61cb94 100644 --- a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java +++ b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.suggest; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; @@ -141,7 +141,7 @@ protected ShardSuggestResponse shardOperation(ShardSuggestRequest request) throw if (suggest != null && suggest.length() > 0) { parser = XContentFactory.xContent(suggest).createParser(suggest); if (parser.nextToken() != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("suggest content missing"); + throw new IllegalArgumentException("suggest content missing"); } final SuggestionSearchContext context = suggestPhase.parseElement().parseInternal(parser, indexService.mapperService(), request.shardId().getIndex(), request.shardId().id()); final Suggest result = suggestPhase.execute(context, searcher.reader()); diff --git a/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java index 1aa0ead9217be..98dca680ef566 100644 --- a/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java +++ b/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.support; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -44,7 +44,7 @@ public T actionGet() throws ElasticsearchException { try { return get(); } catch (InterruptedException e) { - throw new ElasticsearchIllegalStateException("Future got interrupted", e); + throw new IllegalStateException("Future got interrupted", e); } catch (ExecutionException e) { throw rethrowExecutionException(e); } @@ -72,20 +72,24 @@ public T actionGet(long timeout, TimeUnit unit) throws ElasticsearchException { } catch (TimeoutException e) { throw new ElasticsearchTimeoutException(e.getMessage()); } catch (InterruptedException e) { - throw new ElasticsearchIllegalStateException("Future got interrupted", e); + throw new IllegalStateException("Future got interrupted", e); } catch (ExecutionException e) { throw rethrowExecutionException(e); } } - static ElasticsearchException rethrowExecutionException(ExecutionException e) { + static RuntimeException rethrowExecutionException(ExecutionException e) { if (e.getCause() instanceof ElasticsearchException) { ElasticsearchException esEx = (ElasticsearchException) e.getCause(); Throwable root = esEx.unwrapCause(); if (root instanceof ElasticsearchException) { return (ElasticsearchException) root; + } else if (root instanceof RuntimeException) { + return (RuntimeException) root; } return new UncategorizedExecutionException("Failed execution", root); + } else if (e.getCause() instanceof RuntimeException) { + return (RuntimeException) e.getCause(); } else { return new UncategorizedExecutionException("Failed execution", e); } diff --git a/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java b/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java index 0324114bf53cc..5d32b631ae69b 100644 --- a/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java +++ b/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.support; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.settings.NodeSettingsService; @@ -55,15 +55,15 @@ public void failDestructive(String[] aliasesOrIndices) { } if (aliasesOrIndices == null || aliasesOrIndices.length == 0) { - throw new ElasticsearchIllegalArgumentException("Wildcard expressions or all indices are not allowed"); + throw new IllegalArgumentException("Wildcard expressions or all indices are not allowed"); } else if (aliasesOrIndices.length == 1) { if (hasWildcardUsage(aliasesOrIndices[0])) { - throw new ElasticsearchIllegalArgumentException("Wildcard expressions or all indices are not allowed"); + throw new IllegalArgumentException("Wildcard expressions or all indices are not allowed"); } } else { for (String aliasesOrIndex : aliasesOrIndices) { if (hasWildcardUsage(aliasesOrIndex)) { - throw new ElasticsearchIllegalArgumentException("Wildcard expressions or all indices are not allowed"); + throw new IllegalArgumentException("Wildcard expressions or all indices are not allowed"); } } } diff --git a/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/src/main/java/org/elasticsearch/action/support/IndicesOptions.java index 84e458ded2138..ccd458acb1fd6 100644 --- a/src/main/java/org/elasticsearch/action/support/IndicesOptions.java +++ b/src/main/java/org/elasticsearch/action/support/IndicesOptions.java @@ -18,8 +18,8 @@ */ package org.elasticsearch.action.support; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.common.Strings; +import java.lang.IllegalArgumentException; + import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.rest.RestRequest; @@ -121,7 +121,7 @@ public static IndicesOptions readIndicesOptions(StreamInput in) throws IOExcepti //we just receive the old corresponding value with the new flag set to true (default) byte id = in.readByte(); if (id >= VALUES.length) { - throw new ElasticsearchIllegalArgumentException("No valid missing index type id: " + id); + throw new IllegalArgumentException("No valid missing index type id: " + id); } return VALUES[id]; } @@ -179,7 +179,7 @@ public static IndicesOptions fromParameters(Object wildcardsString, Object ignor expandWildcardsOpen = true; expandWildcardsClosed = true; } else { - throw new ElasticsearchIllegalArgumentException("No valid expand wildcard value [" + wildcard + "]"); + throw new IllegalArgumentException("No valid expand wildcard value [" + wildcard + "]"); } } } diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java index a413edfa23206..858b55d1c5bee 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.termvectors; import com.google.common.collect.Iterators; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.common.Nullable; @@ -98,7 +98,7 @@ public void add(TermVectorsRequest template, BytesReference data) throws Excepti if ("docs".equals(currentFieldName)) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("docs array element should include an object"); + throw new IllegalArgumentException("docs array element should include an object"); } TermVectorsRequest termVectorsRequest = new TermVectorsRequest(template); TermVectorsRequest.parseRequest(termVectorsRequest, parser); @@ -107,7 +107,7 @@ public void add(TermVectorsRequest template, BytesReference data) throws Excepti } else if ("ids".equals(currentFieldName)) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (!token.isValue()) { - throw new ElasticsearchIllegalArgumentException("ids array element should only contain ids"); + throw new IllegalArgumentException("ids array element should only contain ids"); } ids.add(parser.text()); } diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java index 06c92fcd0a0fe..86e98293153ed 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java @@ -28,7 +28,7 @@ import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest.Flag; import org.elasticsearch.common.Nullable; @@ -320,7 +320,7 @@ private void buildFieldStatistics(XContentBuilder builder, Terms curTerms) throw assert ((sumDocFreq == -1)) : "docCount was -1 but sumDocFreq ain't!"; assert ((sumTotalTermFrequencies == -1)) : "docCount was -1 but sumTotalTermFrequencies ain't!"; } else { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( "Something is wrong with the field statistics of the term vector request: Values are " + "\n" + FieldStrings.SUM_DOC_FREQ + " " + sumDocFreq + "\n" + FieldStrings.DOC_COUNT + " " + docCount + "\n" + FieldStrings.SUM_TTF + " " + sumTotalTermFrequencies); diff --git a/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java index d35565cbec5c4..31f2b4c53146f 100644 --- a/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java +++ b/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; @@ -275,7 +275,7 @@ protected void doRun() { listener.onResponse(update); break; default: - throw new ElasticsearchIllegalStateException("Illegal operation " + result.operation()); + throw new IllegalStateException("Illegal operation " + result.operation()); } } } diff --git a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index d00ee181b9ec1..f60a09fcd1432 100644 --- a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.update; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.client.Requests; @@ -101,7 +101,7 @@ public Result prepare(UpdateRequest request, IndexShard indexShard) { // we need to unwrap the ctx... ctx = (Map) script.unwrap(ctx); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to execute script", e); + throw new IllegalArgumentException("failed to execute script", e); } //Allow the script to set TTL using ctx._ttl ttl = getTTLFromScriptContext(ctx); @@ -200,7 +200,7 @@ public Result prepare(UpdateRequest request, IndexShard indexShard) { // we need to unwrap the ctx... ctx = (Map) script.unwrap(ctx); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to execute script", e); + throw new IllegalArgumentException("failed to execute script", e); } operation = (String) ctx.get("op"); diff --git a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java b/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java index 96f6a098ab8a2..2f059ac2f41ce 100644 --- a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java +++ b/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java @@ -20,7 +20,7 @@ package org.elasticsearch.cache.recycler; import com.google.common.base.Strings; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.recycler.AbstractRecyclerC; @@ -213,7 +213,7 @@ public static Type parse(String type) { try { return Type.valueOf(type.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { - throw new ElasticsearchIllegalArgumentException("no type support [" + type + "]"); + throw new IllegalArgumentException("no type support [" + type + "]"); } } diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java index ced572ecd1554..4fe1d48a2e98a 100644 --- a/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java +++ b/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java @@ -24,7 +24,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; @@ -145,7 +145,7 @@ public ImmutableList listedNodes() { public TransportClientNodesService addTransportAddresses(TransportAddress... transportAddresses) { synchronized (mutex) { if (closed) { - throw new ElasticsearchIllegalStateException("transport client is closed, can't add an address"); + throw new IllegalStateException("transport client is closed, can't add an address"); } List filtered = Lists.newArrayListWithExpectedSize(transportAddresses.length); for (TransportAddress transportAddress : transportAddresses) { @@ -180,7 +180,7 @@ public TransportClientNodesService addTransportAddresses(TransportAddress... tra public TransportClientNodesService removeTransportAddress(TransportAddress transportAddress) { synchronized (mutex) { if (closed) { - throw new ElasticsearchIllegalStateException("transport client is closed, can't remove an address"); + throw new IllegalStateException("transport client is closed, can't remove an address"); } ImmutableList.Builder builder = ImmutableList.builder(); for (DiscoveryNode otherNode : listedNodes) { diff --git a/src/main/java/org/elasticsearch/cluster/ClusterService.java b/src/main/java/org/elasticsearch/cluster/ClusterService.java index 805419ccc99f3..bf351e46758f8 100644 --- a/src/main/java/org/elasticsearch/cluster/ClusterService.java +++ b/src/main/java/org/elasticsearch/cluster/ClusterService.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.OperationRouting; @@ -50,12 +50,12 @@ public interface ClusterService extends LifecycleComponent { /** * Adds an initial block to be set on the first cluster state created. */ - void addInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException; + void addInitialStateBlock(ClusterBlock block) throws IllegalStateException; /** * Remove an initial block to be set on the first cluster state created. */ - void removeInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException; + void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException; /** * The operation routing. diff --git a/src/main/java/org/elasticsearch/cluster/ClusterState.java b/src/main/java/org/elasticsearch/cluster/ClusterState.java index ef4d67740dcfe..1f1b8769efae2 100644 --- a/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -22,7 +22,7 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlocks; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -103,10 +103,10 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws ElasticsearchIllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { Custom.Factory factory = customFactories.get(type); if (factory == null) { - throw new ElasticsearchIllegalArgumentException("No custom state factory registered for type [" + type + "]"); + throw new IllegalArgumentException("No custom state factory registered for type [" + type + "]"); } return factory; } @@ -288,7 +288,7 @@ public static EnumSet parseString(String param, boolean ignoreUnknown) { Metric m = valueToEnum.get(metric); if (m == null) { if (!ignoreUnknown) { - throw new ElasticsearchIllegalArgumentException("Unknown metric [" + metric + "]"); + throw new IllegalArgumentException("Unknown metric [" + metric + "]"); } } else { result.add(m); diff --git a/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java index 44727699354b7..532f829a06f05 100644 --- a/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java +++ b/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.action.index; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -71,7 +71,7 @@ public void setClient(Client client) { private PutMappingRequestBuilder updateMappingRequest(String index, String type, Mapping mappingUpdate, final TimeValue timeout) { if (type.equals(MapperService.DEFAULT_MAPPING)) { - throw new ElasticsearchIllegalArgumentException("_default_ mapping should not be updated"); + throw new IllegalArgumentException("_default_ mapping should not be updated"); } return client.preparePutMapping(index).setType(type).setSource(mappingUpdate.toString()) .setMasterNodeTimeout(timeout).setTimeout(timeout); diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java index dace9e8b4f59e..3fc77b4ee4c26 100644 --- a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java +++ b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.block; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.EnumSet; @@ -55,6 +55,6 @@ static ClusterBlockLevel fromId(int id) { } else if (id == 3) { return METADATA_WRITE; } - throw new ElasticsearchIllegalArgumentException("No cluster block level matching [" + id + "]"); + throw new IllegalArgumentException("No cluster block level matching [" + id + "]"); } } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java index 29bcba360bbc2..5d2156ef56ed3 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -59,7 +59,7 @@ public static Type fromValue(byte value) { } else if (value == 1) { return REMOVE; } else { - throw new ElasticsearchIllegalArgumentException("No type for action [" + value + "]"); + throw new IllegalArgumentException("No type for action [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java index 72f7a5994883e..8a5ae1b128a47 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.common.Strings; import org.elasticsearch.common.component.AbstractComponent; @@ -48,7 +48,7 @@ public AliasValidator(Settings settings) { /** * Allows to validate an {@link org.elasticsearch.cluster.metadata.AliasAction} and make sure * it's valid before it gets added to the index metadata. Doesn't validate the alias filter. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the alias is not valid + * @throws IllegalArgumentException if the alias is not valid */ public void validateAliasAction(AliasAction aliasAction, MetaData metaData) { validateAlias(aliasAction.alias(), aliasAction.index(), aliasAction.indexRouting(), metaData); @@ -57,7 +57,7 @@ public void validateAliasAction(AliasAction aliasAction, MetaData metaData) { /** * Allows to validate an {@link org.elasticsearch.action.admin.indices.alias.Alias} and make sure * it's valid before it gets added to the index metadata. Doesn't validate the alias filter. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the alias is not valid + * @throws IllegalArgumentException if the alias is not valid */ public void validateAlias(Alias alias, String index, MetaData metaData) { validateAlias(alias.name(), index, alias.indexRouting(), metaData); @@ -66,7 +66,7 @@ public void validateAlias(Alias alias, String index, MetaData metaData) { /** * Allows to validate an {@link org.elasticsearch.cluster.metadata.AliasMetaData} and make sure * it's valid before it gets added to the index metadata. Doesn't validate the alias filter. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the alias is not valid + * @throws IllegalArgumentException if the alias is not valid */ public void validateAliasMetaData(AliasMetaData aliasMetaData, String index, MetaData metaData) { validateAlias(aliasMetaData.alias(), index, aliasMetaData.indexRouting(), metaData); @@ -77,7 +77,7 @@ public void validateAliasMetaData(AliasMetaData aliasMetaData, String index, Met * Useful with index templates containing aliases. Checks also that it is possible to parse * the alias filter via {@link org.elasticsearch.common.xcontent.XContentParser}, * without validating it as a filter though. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the alias is not valid + * @throws IllegalArgumentException if the alias is not valid */ public void validateAliasStandalone(Alias alias) { validateAliasStandalone(alias.name(), alias.indexRouting()); @@ -86,7 +86,7 @@ public void validateAliasStandalone(Alias alias) { XContentParser parser = XContentFactory.xContent(alias.filter()).createParser(alias.filter()); parser.mapAndClose(); } catch (Throwable e) { - throw new ElasticsearchIllegalArgumentException("failed to parse filter for alias [" + alias.name() + "]", e); + throw new IllegalArgumentException("failed to parse filter for alias [" + alias.name() + "]", e); } } } @@ -95,7 +95,7 @@ private void validateAlias(String alias, String index, String indexRouting, Meta validateAliasStandalone(alias, indexRouting); if (!Strings.hasText(index)) { - throw new ElasticsearchIllegalArgumentException("index name is required"); + throw new IllegalArgumentException("index name is required"); } assert metaData != null; @@ -106,17 +106,17 @@ private void validateAlias(String alias, String index, String indexRouting, Meta private void validateAliasStandalone(String alias, String indexRouting) { if (!Strings.hasText(alias)) { - throw new ElasticsearchIllegalArgumentException("alias name is required"); + throw new IllegalArgumentException("alias name is required"); } if (indexRouting != null && indexRouting.indexOf(',') != -1) { - throw new ElasticsearchIllegalArgumentException("alias [" + alias + "] has several index routing values associated with it"); + throw new IllegalArgumentException("alias [" + alias + "] has several index routing values associated with it"); } } /** * Validates an alias filter by parsing it using the * provided {@link org.elasticsearch.index.query.IndexQueryParserService} - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the filter is not valid + * @throws IllegalArgumentException if the filter is not valid */ public void validateAliasFilter(String alias, String filter, IndexQueryParserService indexQueryParserService) { assert indexQueryParserService != null; @@ -124,14 +124,14 @@ public void validateAliasFilter(String alias, String filter, IndexQueryParserSer XContentParser parser = XContentFactory.xContent(filter).createParser(filter); validateAliasFilter(parser, indexQueryParserService); } catch (Throwable e) { - throw new ElasticsearchIllegalArgumentException("failed to parse filter for alias [" + alias + "]", e); + throw new IllegalArgumentException("failed to parse filter for alias [" + alias + "]", e); } } /** * Validates an alias filter by parsing it using the * provided {@link org.elasticsearch.index.query.IndexQueryParserService} - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if the filter is not valid + * @throws IllegalArgumentException if the filter is not valid */ public void validateAliasFilter(String alias, byte[] filter, IndexQueryParserService indexQueryParserService) { assert indexQueryParserService != null; @@ -139,7 +139,7 @@ public void validateAliasFilter(String alias, byte[] filter, IndexQueryParserSer XContentParser parser = XContentFactory.xContent(filter).createParser(filter); validateAliasFilter(parser, indexQueryParserService); } catch (Throwable e) { - throw new ElasticsearchIllegalArgumentException("failed to parse filter for alias [" + alias + "]", e); + throw new IllegalArgumentException("failed to parse filter for alias [" + alias + "]", e); } } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index 1543151fad018..8cea5faf7a40d 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -22,8 +22,8 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -109,10 +109,10 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws ElasticsearchIllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { Custom.Factory factory = customFactories.get(type); if (factory == null) { - throw new ElasticsearchIllegalArgumentException("No custom index metadata factoy registered for type [" + type + "]"); + throw new IllegalArgumentException("No custom index metadata factoy registered for type [" + type + "]"); } return factory; } @@ -142,7 +142,7 @@ public static State fromId(byte id) { } else if (id == 1) { return CLOSE; } - throw new ElasticsearchIllegalStateException("No state match for id [" + id + "]"); + throw new IllegalStateException("No state match for id [" + id + "]"); } public static State fromString(String state) { @@ -151,7 +151,7 @@ public static State fromString(String state) { } else if ("close".equals(state)) { return CLOSE; } - throw new ElasticsearchIllegalStateException("No state match for [" + state + "]"); + throw new IllegalStateException("No state match for [" + state + "]"); } } public static final String INDEX_SETTING_PREFIX = "index."; @@ -237,7 +237,7 @@ private IndexMetaData(String index, long version, State state, Settings settings try { routingHashFunction = hashFunctionClass.newInstance(); } catch (InstantiationException | IllegalAccessException e) { - throw new ElasticsearchIllegalStateException("Cannot instantiate hash function", e); + throw new IllegalStateException("Cannot instantiate hash function", e); } } useTypeForRouting = settings.getAsBoolean(SETTING_LEGACY_ROUTING_USE_TYPE, false); diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java index f2ace98caebaf..6dc595be51c1e 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.TimestampParsingException; import org.elasticsearch.common.Nullable; @@ -297,7 +297,7 @@ public MappingMetaData(CompressedString mapping) throws IOException { this.source = mapping; Map mappingMap = XContentHelper.createParser(mapping.compressed(), 0, mapping.compressed().length).mapOrderedAndClose(); if (mappingMap.size() != 1) { - throw new ElasticsearchIllegalStateException("Can't derive type from mapping, no root type: " + mapping.string()); + throw new IllegalStateException("Can't derive type from mapping, no root type: " + mapping.string()); } this.type = mappingMap.keySet().iterator().next(); initMappers((Map) mappingMap.get(this.type)); diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java index 51793b1d27bbf..7dd6dc8f7bf7f 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java @@ -25,7 +25,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.base.Predicate; import com.google.common.collect.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -116,10 +116,10 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws ElasticsearchIllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { Custom.Factory factory = customFactories.get(type); if (factory == null) { - throw new ElasticsearchIllegalArgumentException("No custom index metadata factory registered for type [" + type + "]"); + throw new IllegalArgumentException("No custom index metadata factory registered for type [" + type + "]"); } return factory; } @@ -474,20 +474,20 @@ public String resolveIndexRouting(@Nullable String routing, String aliasOrIndex) return routing; } if (indexAliases.size() > 1) { - throw new ElasticsearchIllegalArgumentException("Alias [" + aliasOrIndex + "] has more than one index associated with it [" + Arrays.toString(indexAliases.keys().toArray(String.class)) + "], can't execute a single index op"); + throw new IllegalArgumentException("Alias [" + aliasOrIndex + "] has more than one index associated with it [" + Arrays.toString(indexAliases.keys().toArray(String.class)) + "], can't execute a single index op"); } AliasMetaData aliasMd = indexAliases.values().iterator().next().value; if (aliasMd.indexRouting() != null) { if (routing != null) { if (!routing.equals(aliasMd.indexRouting())) { - throw new ElasticsearchIllegalArgumentException("Alias [" + aliasOrIndex + "] has index routing associated with it [" + aliasMd.indexRouting() + "], and was provided with routing value [" + routing + "], rejecting operation"); + throw new IllegalArgumentException("Alias [" + aliasOrIndex + "] has index routing associated with it [" + aliasMd.indexRouting() + "], and was provided with routing value [" + routing + "], rejecting operation"); } } routing = aliasMd.indexRouting(); } if (routing != null) { if (routing.indexOf(',') != -1) { - throw new ElasticsearchIllegalArgumentException("index/alias [" + aliasOrIndex + "] provided with routing value [" + routing + "] that resolved to several routing values, rejecting operation"); + throw new IllegalArgumentException("index/alias [" + aliasOrIndex + "] provided with routing value [" + routing + "] that resolved to several routing values, rejecting operation"); } } return routing; @@ -651,10 +651,10 @@ private Map> resolveSearchRoutingAllIndices(String routing) * @throws IndexMissingException if one of the aliases or indices is missing and the provided indices options * don't allow such a case, or if the final result of the indices resolution is no indices and the indices options * don't allow such a case. - * @throws ElasticsearchIllegalArgumentException if one of the aliases resolve to multiple indices and the provided + * @throws IllegalArgumentException if one of the aliases resolve to multiple indices and the provided * indices options don't allow such a case. */ - public String[] concreteIndices(IndicesOptions indicesOptions, String... aliasesOrIndices) throws IndexMissingException, ElasticsearchIllegalArgumentException { + public String[] concreteIndices(IndicesOptions indicesOptions, String... aliasesOrIndices) throws IndexMissingException, IllegalArgumentException { if (indicesOptions.expandWildcardsOpen() || indicesOptions.expandWildcardsClosed()) { if (isAllIndices(aliasesOrIndices)) { String[] concreteIndices; @@ -677,7 +677,7 @@ public String[] concreteIndices(IndicesOptions indicesOptions, String... aliases if (aliasesOrIndices == null || aliasesOrIndices.length == 0) { if (!indicesOptions.allowNoIndices()) { - throw new ElasticsearchIllegalArgumentException("no indices were specified and wildcard expansion is disabled."); + throw new IllegalArgumentException("no indices were specified and wildcard expansion is disabled."); } else { return Strings.EMPTY_ARRAY; } @@ -734,23 +734,23 @@ public String[] concreteIndices(IndicesOptions indicesOptions, String... aliases * Utility method that allows to resolve an index or alias to its corresponding single concrete index. * Callers should make sure they provide proper {@link org.elasticsearch.action.support.IndicesOptions} * that require a single index as a result. The indices resolution must in fact return a single index when - * using this method, an {@link org.elasticsearch.ElasticsearchIllegalArgumentException} gets thrown otherwise. + * using this method, an {@link IllegalArgumentException} gets thrown otherwise. * * @param indexOrAlias the index or alias to be resolved to concrete index * @param indicesOptions the indices options to be used for the index resolution * @return the concrete index obtained as a result of the index resolution * @throws IndexMissingException if the index or alias provided doesn't exist - * @throws ElasticsearchIllegalArgumentException if the index resolution lead to more than one index + * @throws IllegalArgumentException if the index resolution lead to more than one index */ - public String concreteSingleIndex(String indexOrAlias, IndicesOptions indicesOptions) throws IndexMissingException, ElasticsearchIllegalArgumentException { + public String concreteSingleIndex(String indexOrAlias, IndicesOptions indicesOptions) throws IndexMissingException, IllegalArgumentException { String[] indices = concreteIndices(indicesOptions, indexOrAlias); if (indices.length != 1) { - throw new ElasticsearchIllegalArgumentException("unable to return a single index as the index and options provided got resolved to multiple indices"); + throw new IllegalArgumentException("unable to return a single index as the index and options provided got resolved to multiple indices"); } return indices[0]; } - private String[] concreteIndices(String aliasOrIndex, IndicesOptions options, boolean failNoIndices) throws IndexMissingException, ElasticsearchIllegalArgumentException { + private String[] concreteIndices(String aliasOrIndex, IndicesOptions options, boolean failNoIndices) throws IndexMissingException, IllegalArgumentException { boolean failClosed = options.forbidClosedIndices() && !options.ignoreUnavailable(); // a quick check, if this is an actual index, if so, return it @@ -772,7 +772,7 @@ private String[] concreteIndices(String aliasOrIndex, IndicesOptions options, bo throw new IndexMissingException(new Index(aliasOrIndex)); } if (indices.length > 1 && !options.allowAliasesToMultipleIndices()) { - throw new ElasticsearchIllegalArgumentException("Alias [" + aliasOrIndex + "] has more than one indices associated with it [" + Arrays.toString(indices) + "], can't execute a single index op"); + throw new IllegalArgumentException("Alias [" + aliasOrIndex + "] has more than one indices associated with it [" + Arrays.toString(indices) + "], can't execute a single index op"); } // No need to check whether indices referred by aliases are closed, because there are no closed indices. diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 244c598f0a3dd..67ddf9ea81b34 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -26,7 +26,7 @@ import com.google.common.collect.Maps; import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; @@ -425,7 +425,7 @@ public ClusterState execute(ClusterState currentState) throws Exception { } for (Alias alias : request.aliases()) { AliasMetaData aliasMetaData = AliasMetaData.builder(alias.name()).filter(alias.filter()) - .indexRouting(alias.indexRouting()).searchRouting(alias.searchRouting()).build(); + .indexRouting(alias.indexRouting()).searchRouting(alias.searchRouting()).build(); indexMetaDataBuilder.putAlias(aliasMetaData); } @@ -444,11 +444,11 @@ public ClusterState execute(ClusterState currentState) throws Exception { } indexService.indicesLifecycle().beforeIndexAddedToCluster(new Index(request.index()), - indexMetaData.settings()); + indexMetaData.settings()); MetaData newMetaData = MetaData.builder(currentState.metaData()) - .put(indexMetaData, false) - .build(); + .put(indexMetaData, false) + .build(); logger.info("[{}] creating index, cause [{}], templates {}, shards [{}]/[{}], mappings {}", request.index(), request.cause(), templateNames, indexMetaData.numberOfShards(), indexMetaData.numberOfReplicas(), mappings.keySet()); @@ -466,7 +466,7 @@ public ClusterState execute(ClusterState currentState) throws Exception { if (request.state() == State.OPEN) { RoutingTable.Builder routingTableBuilder = RoutingTable.builder(updatedState.routingTable()) - .addAsNew(updatedState.metaData().index(request.index())); + .addAsNew(updatedState.metaData().index(request.index())); RoutingAllocation.Result routingResult = allocationService.reroute(ClusterState.builder(updatedState).routingTable(routingTableBuilder).build()); updatedState = ClusterState.builder(updatedState).routingResult(routingResult).build(); } @@ -572,7 +572,7 @@ public void validateIndexSettings(String indexName, Settings settings) throws In } if (validationErrors.isEmpty() == false) { throw new IndexCreationException(new Index(indexName), - new ElasticsearchIllegalArgumentException(getMessage(validationErrors))); + new IllegalArgumentException(getMessage(validationErrors))); } } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java index 5c556b86246bd..8377f3ae41d98 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.close.CloseIndexClusterStateUpdateRequest; import org.elasticsearch.action.admin.indices.open.OpenIndexClusterStateUpdateRequest; @@ -68,7 +68,7 @@ public MetaDataIndexStateService(Settings settings, ClusterService clusterServic public void closeIndex(final CloseIndexClusterStateUpdateRequest request, final ActionListener listener) { if (request.indices() == null || request.indices().length == 0) { - throw new ElasticsearchIllegalArgumentException("Index name is required"); + throw new IllegalArgumentException("Index name is required"); } final String indicesAsString = Arrays.toString(request.indices()); @@ -128,7 +128,7 @@ public ClusterState execute(ClusterState currentState) { public void openIndex(final OpenIndexClusterStateUpdateRequest request, final ActionListener listener) { if (request.indices() == null || request.indices().length == 0) { - throw new ElasticsearchIllegalArgumentException("Index name is required"); + throw new IllegalArgumentException("Index name is required"); } final String indicesAsString = Arrays.toString(request.indices()); diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java index 95c806f7d49f5..66ac3b17fb6d2 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java @@ -23,7 +23,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.support.master.MasterNodeOperationRequest; import org.elasticsearch.cluster.ClusterService; @@ -111,11 +111,11 @@ public void putTemplate(final PutRequest request, final PutListener listener) { request.settings(updatedSettingsBuilder.build()); if (request.name == null) { - listener.onFailure(new ElasticsearchIllegalArgumentException("index_template must provide a name")); + listener.onFailure(new IllegalArgumentException("index_template must provide a name")); return; } if (request.template == null) { - listener.onFailure(new ElasticsearchIllegalArgumentException("index_template must provide a template")); + listener.onFailure(new IllegalArgumentException("index_template must provide a template")); return; } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java index bc7539a7ff1eb..3caa1a9e0e41f 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.metadata; import com.google.common.collect.Sets; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsClusterStateUpdateRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -172,7 +172,7 @@ public void updateSettings(final UpdateSettingsClusterStateUpdateRequest request // never allow to change the number of shards for (String key : updatedSettingsBuilder.internalMap().keySet()) { if (key.equals(IndexMetaData.SETTING_NUMBER_OF_SHARDS)) { - listener.onFailure(new ElasticsearchIllegalArgumentException("can't change the number of shards for an index")); + listener.onFailure(new IllegalArgumentException("can't change the number of shards for an index")); return; } } @@ -193,7 +193,7 @@ public void updateSettings(final UpdateSettingsClusterStateUpdateRequest request } if (!errors.isEmpty()) { - listener.onFailure(new ElasticsearchIllegalArgumentException("can't process the settings: " + errors.toString())); + listener.onFailure(new IllegalArgumentException("can't process the settings: " + errors.toString())); return; } @@ -230,7 +230,7 @@ public ClusterState execute(ClusterState currentState) { } if (!removedSettings.isEmpty() && !openIndices.isEmpty()) { - throw new ElasticsearchIllegalArgumentException(String.format(Locale.ROOT, + throw new IllegalArgumentException(String.format(Locale.ROOT, "Can't update non dynamic settings[%s] for open indices[%s]", removedSettings, openIndices diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java index 373d5ff858c9e..51aa9198e2fa3 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -389,7 +389,7 @@ public static State fromValue(byte value) { case 3: return FAILURE; default: - throw new ElasticsearchIllegalArgumentException("No snapshot state for value [" + value + "]"); + throw new IllegalArgumentException("No snapshot state for value [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java index b759fe5daebaf..1622c2478126b 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -301,7 +301,7 @@ public static State fromValue(byte value) { case 6: return WAITING; default: - throw new ElasticsearchIllegalArgumentException("No snapshot state for value [" + value + "]"); + throw new IllegalArgumentException("No snapshot state for value [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index 13b0a62f0e6c5..0ea050c2fe833 100644 --- a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Strings; @@ -59,7 +59,7 @@ public static boolean localNode(Settings settings) { } else if ("network".equals(nodeMode)) { return false; } else { - throw new ElasticsearchIllegalArgumentException("unsupported node.mode [" + nodeMode + "]. Should be one of [local, network]."); + throw new IllegalArgumentException("unsupported node.mode [" + nodeMode + "]. Should be one of [local, network]."); } } return false; diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java index 0a4986476e5c1..ec2a6abc40258 100644 --- a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java +++ b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java @@ -24,7 +24,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableList; import com.google.common.collect.UnmodifiableIterator; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Nullable; @@ -311,15 +311,15 @@ public Version smallestNonClientNodeVersion() { * * @param node id of the node to discover * @return discovered node matching the given id - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if more than one node matches the request or no nodes have been resolved + * @throws IllegalArgumentException if more than one node matches the request or no nodes have been resolved */ public DiscoveryNode resolveNode(String node) { String[] resolvedNodeIds = resolveNodesIds(node); if (resolvedNodeIds.length > 1) { - throw new ElasticsearchIllegalArgumentException("resolved [" + node + "] into [" + resolvedNodeIds.length + "] nodes, where expected to be resolved to a single node"); + throw new IllegalArgumentException("resolved [" + node + "] into [" + resolvedNodeIds.length + "] nodes, where expected to be resolved to a single node"); } if (resolvedNodeIds.length == 0) { - throw new ElasticsearchIllegalArgumentException("failed to resolve [" + node + " ], no matching nodes"); + throw new IllegalArgumentException("failed to resolve [" + node + " ], no matching nodes"); } return nodes.get(resolvedNodeIds[0]); } diff --git a/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java index 5f0356d357254..afa92bae30d04 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java +++ b/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java @@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.collect.UnmodifiableIterator; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.collect.ImmutableOpenIntMap; @@ -398,7 +398,7 @@ public Builder initializeAsRestore(IndexMetaData indexMetaData, RestoreSource re */ private Builder initializeAsRestore(IndexMetaData indexMetaData, RestoreSource restoreSource, IntSet ignoreShards, boolean asNew) { if (!shards.isEmpty()) { - throw new ElasticsearchIllegalStateException("trying to initialize an index with fresh shards, but already has shards created"); + throw new IllegalStateException("trying to initialize an index with fresh shards, but already has shards created"); } for (int shardId = 0; shardId < indexMetaData.numberOfShards(); shardId++) { IndexShardRoutingTable.Builder indexShardRoutingBuilder = new IndexShardRoutingTable.Builder(new ShardId(indexMetaData.index(), shardId), asNew ? false : true); @@ -420,7 +420,7 @@ private Builder initializeAsRestore(IndexMetaData indexMetaData, RestoreSource r */ private Builder initializeEmpty(IndexMetaData indexMetaData, boolean asNew) { if (!shards.isEmpty()) { - throw new ElasticsearchIllegalStateException("trying to initialize an index with fresh shards, but already has shards created"); + throw new IllegalStateException("trying to initialize an index with fresh shards, but already has shards created"); } for (int shardId = 0; shardId < indexMetaData.numberOfShards(); shardId++) { IndexShardRoutingTable.Builder indexShardRoutingBuilder = new IndexShardRoutingTable.Builder(new ShardId(indexMetaData.index(), shardId), asNew ? false : true); diff --git a/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java index ee9f4270c8cab..9f55d7d889380 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java +++ b/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -185,7 +185,7 @@ private ShardIterator preferenceActiveShardIterator(IndexShardRoutingTable index ensureNodeIdExists(nodes, nodeId); return indexShard.onlyNodeActiveInitializingShardsIt(nodeId); default: - throw new ElasticsearchIllegalArgumentException("unknown preference [" + preferenceType + "]"); + throw new IllegalArgumentException("unknown preference [" + preferenceType + "]"); } } // if not, then use it as the index @@ -260,14 +260,14 @@ protected int hash(HashFunction hashFunction, String routing) { @Deprecated protected int hash(HashFunction hashFunction, String type, String id) { if (type == null || "_all".equals(type)) { - throw new ElasticsearchIllegalArgumentException("Can't route an operation with no type and having type part of the routing (for backward comp)"); + throw new IllegalArgumentException("Can't route an operation with no type and having type part of the routing (for backward comp)"); } return hashFunction.hash(type, id); } private void ensureNodeIdExists(DiscoveryNodes nodes, String nodeId) { if (!nodes.dataNodes().keys().contains(nodeId)) { - throw new ElasticsearchIllegalArgumentException("No data node with id[" + nodeId + "] found"); + throw new IllegalArgumentException("No data node with id[" + nodeId + "] found"); } } diff --git a/src/main/java/org/elasticsearch/cluster/routing/Preference.java b/src/main/java/org/elasticsearch/cluster/routing/Preference.java index 534b13b9a706b..480ea70015796 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/Preference.java +++ b/src/main/java/org/elasticsearch/cluster/routing/Preference.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.routing; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * Routing Preference Type @@ -99,7 +99,7 @@ public static Preference parse(String preference) { case "_onlyLocal": return ONLY_LOCAL; default: - throw new ElasticsearchIllegalArgumentException("no Preference for [" + preferenceType + "]"); + throw new IllegalArgumentException("no Preference for [" + preferenceType + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java index 6f8341087e716..9231f0782b43b 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java +++ b/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing; import com.google.common.collect.Iterators; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import java.util.ArrayList; @@ -90,7 +90,7 @@ void add(MutableShardRouting shard) { // TODO use Set with ShardIds for faster lookup. for (MutableShardRouting shardRouting : shards) { if (shardRouting.shardId().equals(shard.shardId())) { - throw new ElasticsearchIllegalStateException("Trying to add a shard [" + shard.shardId().index().name() + "][" + shard.shardId().id() + "] to a node [" + nodeId + "] where it already exists"); + throw new IllegalStateException("Trying to add a shard [" + shard.shardId().index().name() + "][" + shard.shardId().id() + "] to a node [" + nodeId + "] where it already exists"); } } shards.add(shard); diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java index 7bea17c3c69f8..d5a1f25f98404 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java +++ b/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; /** * Represents the current state of a {@link ShardRouting} as defined by the @@ -69,7 +69,7 @@ public static ShardRoutingState fromValue(byte value) { case 4: return RELOCATING; default: - throw new ElasticsearchIllegalStateException("No routing state mapped for [" + value + "]"); + throw new IllegalStateException("No routing state mapped for [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java index 58f3ae58f5043..21aa3f821646a 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java @@ -21,10 +21,9 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -501,7 +500,7 @@ private boolean applyFailedShard(RoutingAllocation allocation, ShardRouting fail logger.debug("failed shard {} not found in routingNodes, ignoring it", failedShard); } } else { - throw new ElasticsearchIllegalStateException("illegal state for a failed shard, relocating node id is set, but state does not match: " + failedShard); + throw new IllegalStateException("illegal state for a failed shard, relocating node id is set, but state does not match: " + failedShard); } } else { // the shard is not relocating, its either started, or initializing, just cancel it and move on... diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java index 6dde296c18653..941cae71c9816 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java @@ -22,7 +22,7 @@ import com.google.common.base.Predicate; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IntroSorter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingNode; @@ -78,7 +78,7 @@ public void onRefreshSettings(Settings settings) { final float shardBalance = settings.getAsFloat(SETTING_SHARD_BALANCE_FACTOR, weightFunction.shardBalance); float threshold = settings.getAsFloat(SETTING_THRESHOLD, BalancedShardsAllocator.this.threshold); if (threshold <= 0.0f) { - throw new ElasticsearchIllegalArgumentException("threshold must be greater than 0.0f but was: " + threshold); + throw new IllegalArgumentException("threshold must be greater than 0.0f but was: " + threshold); } BalancedShardsAllocator.this.threshold = threshold; BalancedShardsAllocator.this.weightFunction = new WeightFunction(indexBalance, shardBalance); @@ -180,7 +180,7 @@ public static class WeightFunction { public WeightFunction(float indexBalance, float shardBalance) { float sum = indexBalance + shardBalance; if (sum <= 0.0f) { - throw new ElasticsearchIllegalArgumentException("Balance factors must sum to a value > 0 but was: " + sum); + throw new IllegalArgumentException("Balance factors must sum to a value > 0 but was: " + sum); } theta = new float[]{shardBalance / sum, indexBalance / sum}; this.indexBalance = indexBalance; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java index 0bbb7e750da34..515d0a60e9fd8 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java @@ -20,8 +20,8 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -185,7 +185,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "allocate_allocation_command", "failed to find " + shardId + " on the list of unassigned shards")); } - throw new ElasticsearchIllegalArgumentException("[allocate] failed to find " + shardId + " on the list of unassigned shards"); + throw new IllegalArgumentException("[allocate] failed to find " + shardId + " on the list of unassigned shards"); } if (shardRouting.primary() && !allowPrimary) { @@ -193,7 +193,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "allocate_allocation_command", "trying to allocate a primary shard " + shardId + ", which is disabled")); } - throw new ElasticsearchIllegalArgumentException("[allocate] trying to allocate a primary shard " + shardId + ", which is disabled"); + throw new IllegalArgumentException("[allocate] trying to allocate a primary shard " + shardId + ", which is disabled"); } RoutingNode routingNode = allocation.routingNodes().node(discoNode.id()); @@ -203,13 +203,13 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "allocate_allocation_command", "Allocation can only be done on data nodes, not [" + node + "]")); } - throw new ElasticsearchIllegalArgumentException("Allocation can only be done on data nodes, not [" + node + "]"); + throw new IllegalArgumentException("Allocation can only be done on data nodes, not [" + node + "]"); } else { if (explain) { return new RerouteExplanation(this, allocation.decision(Decision.NO, "allocate_allocation_command", "Could not find [" + node + "] among the routing nodes")); } - throw new ElasticsearchIllegalStateException("Could not find [" + node + "] among the routing nodes"); + throw new IllegalStateException("Could not find [" + node + "] among the routing nodes"); } } @@ -218,7 +218,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) if (explain) { return new RerouteExplanation(this, decision); } - throw new ElasticsearchIllegalArgumentException("[allocate] allocation of " + shardId + " on node " + discoNode + " is not allowed, reason: " + decision); + throw new IllegalArgumentException("[allocate] allocation of " + shardId + " on node " + discoNode + " is not allowed, reason: " + decision); } // go over and remove it from the unassigned for (Iterator it = allocation.routingNodes().unassigned().iterator(); it.hasNext(); ) { diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java index 40a75cdfd5219..f73a67115874f 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.routing.allocation.RoutingExplanations; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; @@ -61,10 +61,10 @@ public static AllocationCommand.Factory lookupF } @SuppressWarnings("unchecked") - public static AllocationCommand.Factory lookupFactorySafe(String name) throws ElasticsearchIllegalArgumentException { + public static AllocationCommand.Factory lookupFactorySafe(String name) throws IllegalArgumentException { AllocationCommand.Factory factory = factories.get(name); if (factory == null) { - throw new ElasticsearchIllegalArgumentException("No allocation command factory registered for name [" + name + "]"); + throw new IllegalArgumentException("No allocation command factory registered for name [" + name + "]"); } return factory; } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java index be01ccb6190e4..6ba8c88d21b3a 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -197,7 +197,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "cancel_allocation_command", "can't cancel " + shardId + " on node " + discoNode + ", shard is primary and initializing its state")); } - throw new ElasticsearchIllegalArgumentException("[cancel_allocation] can't cancel " + shardId + " on node " + + throw new IllegalArgumentException("[cancel_allocation] can't cancel " + shardId + " on node " + discoNode + ", shard is primary and initializing its state"); } it.moveToUnassigned(); @@ -220,7 +220,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "cancel_allocation_command", "can't cancel " + shardId + " on node " + discoNode + ", shard is primary and started")); } - throw new ElasticsearchIllegalArgumentException("[cancel_allocation] can't cancel " + shardId + " on node " + + throw new IllegalArgumentException("[cancel_allocation] can't cancel " + shardId + " on node " + discoNode + ", shard is primary and started"); } it.remove(); @@ -233,7 +233,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "cancel_allocation_command", "can't cancel " + shardId + ", failed to find it on node " + discoNode)); } - throw new ElasticsearchIllegalArgumentException("[cancel_allocation] can't cancel " + shardId + ", failed to find it on node " + discoNode); + throw new IllegalArgumentException("[cancel_allocation] can't cancel " + shardId + ", failed to find it on node " + discoNode); } return new RerouteExplanation(this, allocation.decision(Decision.YES, "cancel_allocation_command", "shard " + shardId + " on node " + discoNode + " can be cancelled")); diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java index 0a52f6cc6f49b..bdfad07a9cdab 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -165,7 +165,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "move_allocation_command", "shard " + shardId + " has not been started")); } - throw new ElasticsearchIllegalArgumentException("[move_allocation] can't move " + shardId + + throw new IllegalArgumentException("[move_allocation] can't move " + shardId + ", shard is not started (state = " + shardRouting.state() + "]"); } @@ -175,7 +175,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) if (explain) { return new RerouteExplanation(this, decision); } - throw new ElasticsearchIllegalArgumentException("[move_allocation] can't move " + shardId + ", from " + fromDiscoNode + ", to " + toDiscoNode + ", since its not allowed, reason: " + decision); + throw new IllegalArgumentException("[move_allocation] can't move " + shardId + ", from " + fromDiscoNode + ", to " + toDiscoNode + ", since its not allowed, reason: " + decision); } if (decision.type() == Decision.Type.THROTTLE) { // its being throttled, maybe have a flag to take it into account and fail? for now, just do it since the "user" wants it... @@ -193,7 +193,7 @@ public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) return new RerouteExplanation(this, allocation.decision(Decision.NO, "move_allocation_command", "shard " + shardId + " not found")); } - throw new ElasticsearchIllegalArgumentException("[move_allocation] can't move " + shardId + ", failed to find it on node " + fromDiscoNode); + throw new IllegalArgumentException("[move_allocation] can't move " + shardId + ", failed to find it on node " + fromDiscoNode); } return new RerouteExplanation(this, decision); } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java index f0480c4af7c66..59ef855816dad 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java @@ -19,8 +19,8 @@ package org.elasticsearch.cluster.routing.allocation.decider; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.settings.Validator; @@ -58,7 +58,7 @@ public String validate(String setting, String value) { try { ClusterRebalanceType.parseString(value); return null; - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { return "the value of " + setting + " must be one of: [always, indices_primaries_active, indices_all_active]"; } } @@ -89,7 +89,7 @@ public static ClusterRebalanceType parseString(String typeString) { } else if ("indices_all_active".equalsIgnoreCase(typeString) || "indicesAllActive".equalsIgnoreCase(typeString)) { return ClusterRebalanceType.INDICES_ALL_ACTIVE; } - throw new ElasticsearchIllegalArgumentException("Illegal value for " + CLUSTER_ROUTING_ALLOCATION_ALLOW_REBALANCE + ": " + typeString); + throw new IllegalArgumentException("Illegal value for " + CLUSTER_ROUTING_ALLOCATION_ALLOW_REBALANCE + ": " + typeString); } } @@ -101,7 +101,7 @@ public ClusterRebalanceAllocationDecider(Settings settings, NodeSettingsService String allowRebalance = settings.get(CLUSTER_ROUTING_ALLOCATION_ALLOW_REBALANCE, "indices_all_active"); try { type = ClusterRebalanceType.parseString(allowRebalance); - } catch (ElasticsearchIllegalStateException e) { + } catch (IllegalStateException e) { logger.warn("[{}] has a wrong value {}, defaulting to 'indices_all_active'", CLUSTER_ROUTING_ALLOCATION_ALLOW_REBALANCE, allowRebalance); type = ClusterRebalanceType.INDICES_ALL_ACTIVE; } @@ -119,7 +119,7 @@ public void onRefreshSettings(Settings settings) { ClusterRebalanceType newType = null; try { newType = ClusterRebalanceType.parseString(newAllowRebalance); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // ignore } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java index 4f05fd196fbec..7068d3f0fd9f0 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing.allocation.decider; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -117,7 +117,7 @@ public static Type readFrom(StreamInput in) throws IOException { case 2: return THROTTLE; default: - throw new ElasticsearchIllegalArgumentException("No Type for integer [" + i + "]"); + throw new IllegalArgumentException("No Type for integer [" + i + "]"); } } @@ -133,7 +133,7 @@ public static void writeTo(Type type, StreamOutput out) throws IOException { out.writeVInt(2); break; default: - throw new ElasticsearchIllegalArgumentException("Invalid Type [" + type + "]"); + throw new IllegalArgumentException("Invalid Type [" + type + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java index bcbc1231e4b73..08fa64390df2c 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java @@ -19,8 +19,8 @@ package org.elasticsearch.cluster.routing.allocation.decider; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; @@ -112,7 +112,7 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing return allocation.decision(Decision.NO, NAME, "replica allocations are forbidden"); } default: - throw new ElasticsearchIllegalStateException("Unknown allocation option"); + throw new IllegalStateException("Unknown allocation option"); } } @@ -148,7 +148,7 @@ public Decision canRebalance(ShardRouting shardRouting, RoutingAllocation alloca return allocation.decision(Decision.NO, NAME, "primary rebalancing is forbidden"); } default: - throw new ElasticsearchIllegalStateException("Unknown rebalance option"); + throw new IllegalStateException("Unknown rebalance option"); } } @@ -188,7 +188,7 @@ public static Allocation parse(String strValue) { try { return Allocation.valueOf(strValue); } catch (IllegalArgumentException e) { - throw new ElasticsearchIllegalArgumentException("Illegal allocation.enable value [" + strValue + "]"); + throw new IllegalArgumentException("Illegal allocation.enable value [" + strValue + "]"); } } } @@ -214,7 +214,7 @@ public static Rebalance parse(String strValue) { try { return Rebalance.valueOf(strValue); } catch (IllegalArgumentException e) { - throw new ElasticsearchIllegalArgumentException("Illegal rebalance.enable value [" + strValue + "]"); + throw new IllegalArgumentException("Illegal rebalance.enable value [" + strValue + "]"); } } } diff --git a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java index eb527e07fe4c2..21c6f1361d5ef 100644 --- a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java +++ b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java @@ -21,7 +21,7 @@ import com.google.common.collect.Iterables; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.ClusterState.Builder; @@ -129,17 +129,17 @@ public NodeSettingsService settingsService() { } @Override - public void addInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void addInitialStateBlock(ClusterBlock block) throws IllegalStateException { if (lifecycle.started()) { - throw new ElasticsearchIllegalStateException("can't set initial block when started"); + throw new IllegalStateException("can't set initial block when started"); } initialBlocks.addGlobalBlock(block); } @Override - public void removeInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException { if (lifecycle.started()) { - throw new ElasticsearchIllegalStateException("can't set initial block when started"); + throw new IllegalStateException("can't set initial block when started"); } initialBlocks.removeGlobalBlock(block); } diff --git a/src/main/java/org/elasticsearch/common/Booleans.java b/src/main/java/org/elasticsearch/common/Booleans.java index c70defac09edd..f1422603a9976 100644 --- a/src/main/java/org/elasticsearch/common/Booleans.java +++ b/src/main/java/org/elasticsearch/common/Booleans.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * */ @@ -96,7 +96,7 @@ public static Boolean parseBooleanExact(String value){ return true; } - throw new ElasticsearchIllegalArgumentException("value cannot be parsed to boolean [ true/1/on/yes OR false/0/off/no ] "); + throw new IllegalArgumentException("value cannot be parsed to boolean [ true/1/on/yes OR false/0/off/no ] "); } public static Boolean parseBoolean(String value, Boolean defaultValue) { diff --git a/src/main/java/org/elasticsearch/common/ParseField.java b/src/main/java/org/elasticsearch/common/ParseField.java index a1d6f465a0b1d..26ef60f656a8c 100644 --- a/src/main/java/org/elasticsearch/common/ParseField.java +++ b/src/main/java/org/elasticsearch/common/ParseField.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.EnumSet; import java.util.HashSet; @@ -95,7 +95,7 @@ public boolean match(String currentFieldName, EnumSet flags) { if (allReplacedWith != null) { msg = "Deprecated field [" + currentFieldName + "] used, replaced by [" + allReplacedWith + "]"; } - throw new ElasticsearchIllegalArgumentException(msg); + throw new IllegalArgumentException(msg); } return true; } diff --git a/src/main/java/org/elasticsearch/common/PidFile.java b/src/main/java/org/elasticsearch/common/PidFile.java index b6669b3c3069a..d208044b63c31 100644 --- a/src/main/java/org/elasticsearch/common/PidFile.java +++ b/src/main/java/org/elasticsearch/common/PidFile.java @@ -20,7 +20,7 @@ import com.google.common.base.Charsets; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.monitor.jvm.JvmInfo; import java.io.IOException; @@ -60,7 +60,7 @@ static PidFile create(Path path, boolean deleteOnExit, long pid) throws IOExcept Path parent = path.getParent(); if (parent != null) { if (Files.exists(parent) && Files.isDirectory(parent) == false) { - throw new ElasticsearchIllegalArgumentException(parent + " exists but is not a directory"); + throw new IllegalArgumentException(parent + " exists but is not a directory"); } if (Files.exists(parent) == false) { // only do this if it doesn't exists we get a better exception further down @@ -71,7 +71,7 @@ static PidFile create(Path path, boolean deleteOnExit, long pid) throws IOExcept } } if (Files.exists(path) && Files.isRegularFile(path) == false) { - throw new ElasticsearchIllegalArgumentException(path + " exists but is not a regular file"); + throw new IllegalArgumentException(path + " exists but is not a regular file"); } try(OutputStream stream = Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { diff --git a/src/main/java/org/elasticsearch/common/Preconditions.java b/src/main/java/org/elasticsearch/common/Preconditions.java index 045d24d761701..88002ba22bc4e 100644 --- a/src/main/java/org/elasticsearch/common/Preconditions.java +++ b/src/main/java/org/elasticsearch/common/Preconditions.java @@ -19,8 +19,8 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchNullPointerException; import java.util.NoSuchElementException; @@ -70,12 +70,12 @@ private Preconditions() { * calling method. * * @param expression a boolean expression - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException + * @throws IllegalArgumentException * if {@code expression} is false */ public static void checkArgument(boolean expression) { if (!expression) { - throw new ElasticsearchIllegalArgumentException(); + throw new IllegalArgumentException(); } } @@ -86,12 +86,12 @@ public static void checkArgument(boolean expression) { * @param expression a boolean expression * @param errorMessage the exception message to use if the check fails; will * be converted to a string using {@link String#valueOf(Object)} - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException + * @throws IllegalArgumentException * if {@code expression} is false */ public static void checkArgument(boolean expression, Object errorMessage) { if (!expression) { - throw new ElasticsearchIllegalArgumentException(String.valueOf(errorMessage)); + throw new IllegalArgumentException(String.valueOf(errorMessage)); } } @@ -109,7 +109,7 @@ public static void checkArgument(boolean expression, Object errorMessage) { * @param errorMessageArgs the arguments to be substituted into the message * template. Arguments are converted to strings using * {@link String#valueOf(Object)}. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException + * @throws IllegalArgumentException * if {@code expression} is false * @throws org.elasticsearch.ElasticsearchNullPointerException * if the check fails and either {@code @@ -119,7 +119,7 @@ public static void checkArgument(boolean expression, Object errorMessage) { public static void checkArgument(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) { if (!expression) { - throw new ElasticsearchIllegalArgumentException( + throw new IllegalArgumentException( format(errorMessageTemplate, errorMessageArgs)); } } @@ -129,12 +129,12 @@ public static void checkArgument(boolean expression, * instance, but not involving any parameters to the calling method. * * @param expression a boolean expression - * @throws org.elasticsearch.ElasticsearchIllegalStateException + * @throws IllegalStateException * if {@code expression} is false */ public static void checkState(boolean expression) { if (!expression) { - throw new ElasticsearchIllegalStateException(); + throw new IllegalStateException(); } } @@ -145,12 +145,12 @@ public static void checkState(boolean expression) { * @param expression a boolean expression * @param errorMessage the exception message to use if the check fails; will * be converted to a string using {@link String#valueOf(Object)} - * @throws org.elasticsearch.ElasticsearchIllegalStateException + * @throws IllegalStateException * if {@code expression} is false */ public static void checkState(boolean expression, Object errorMessage) { if (!expression) { - throw new ElasticsearchIllegalStateException(String.valueOf(errorMessage)); + throw new IllegalStateException(String.valueOf(errorMessage)); } } @@ -168,7 +168,7 @@ public static void checkState(boolean expression, Object errorMessage) { * @param errorMessageArgs the arguments to be substituted into the message * template. Arguments are converted to strings using * {@link String#valueOf(Object)}. - * @throws org.elasticsearch.ElasticsearchIllegalStateException + * @throws IllegalStateException * if {@code expression} is false * @throws org.elasticsearch.ElasticsearchNullPointerException * if the check fails and either {@code @@ -178,7 +178,7 @@ public static void checkState(boolean expression, Object errorMessage) { public static void checkState(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) { if (!expression) { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( format(errorMessageTemplate, errorMessageArgs)); } } diff --git a/src/main/java/org/elasticsearch/common/Priority.java b/src/main/java/org/elasticsearch/common/Priority.java index 0aba2ddfd106e..c9233a08a4803 100644 --- a/src/main/java/org/elasticsearch/common/Priority.java +++ b/src/main/java/org/elasticsearch/common/Priority.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -51,7 +51,7 @@ public static Priority fromByte(byte b) { case 3: return LOW; case 4: return LANGUID; default: - throw new ElasticsearchIllegalArgumentException("can't find priority for [" + b + "]"); + throw new IllegalArgumentException("can't find priority for [" + b + "]"); } } diff --git a/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java index 3e9f3a7480352..7992ddb693526 100644 --- a/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java +++ b/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.io.IOException; import java.util.Random; @@ -62,7 +62,7 @@ public String getBase64UUID(Random random) { assert encoded[encoded.length - 2] == '='; return new String(encoded, 0, encoded.length - 2, Base64.PREFERRED_ENCODING); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("should not be thrown"); + throw new IllegalStateException("should not be thrown"); } } } diff --git a/src/main/java/org/elasticsearch/common/Table.java b/src/main/java/org/elasticsearch/common/Table.java index 18ba34c248753..183e51c7ecadd 100644 --- a/src/main/java/org/elasticsearch/common/Table.java +++ b/src/main/java/org/elasticsearch/common/Table.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.util.ArrayList; import java.util.HashMap; @@ -47,7 +47,7 @@ public Table startHeaders() { public Table endHeaders() { if (currentCells == null || currentCells.isEmpty()) { - throw new ElasticsearchIllegalStateException("no headers added..."); + throw new IllegalStateException("no headers added..."); } inHeaders = false; headers = currentCells; @@ -73,7 +73,7 @@ public Table endHeaders() { public Table startRow() { if (headers.isEmpty()) { - throw new ElasticsearchIllegalStateException("no headers added..."); + throw new IllegalStateException("no headers added..."); } currentCells = new ArrayList<>(headers.size()); return this; @@ -81,7 +81,7 @@ public Table startRow() { public Table endRow(boolean check) { if (currentCells == null) { - throw new ElasticsearchIllegalStateException("no row started..."); + throw new IllegalStateException("no row started..."); } if (check && (currentCells.size() != headers.size())) { StringBuilder s = new StringBuilder(); @@ -89,7 +89,7 @@ public Table endRow(boolean check) { s.append(currentCells.size()); s.append(" in a row compared to header "); s.append(headers.size()); - throw new ElasticsearchIllegalStateException(s.toString()); + throw new IllegalStateException(s.toString()); } rows.add(currentCells); currentCells = null; @@ -107,11 +107,11 @@ public Table addCell(Object value) { public Table addCell(Object value, String attributes) { if (currentCells == null) { - throw new ElasticsearchIllegalStateException("no block started..."); + throw new IllegalStateException("no block started..."); } if (!inHeaders) { if (currentCells.size() == headers.size()) { - throw new ElasticsearchIllegalStateException("can't add more cells to a row than the header"); + throw new IllegalStateException("can't add more cells to a row than the header"); } } Map mAttr; diff --git a/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java b/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java index b354a3c063e2e..0561956552cfe 100644 --- a/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java +++ b/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java @@ -19,12 +19,10 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.io.IOException; -import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; /** These are essentially flake ids (http://boundary.com/blog/2012/01/12/flake-a-decentralized-k-ordered-unique-id-generator-in-erlang) but * we use 6 (not 8) bytes for timestamp, and use 3 (not 2) bytes for sequence number. */ @@ -87,7 +85,7 @@ public String getBase64UUID() { try { encoded = Base64.encodeBytesToBytes(uuidBytes, 0, uuidBytes.length, Base64.URL_SAFE); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("should not be thrown", e); + throw new IllegalStateException("should not be thrown", e); } // We are a multiple of 3 bytes so we should not see any padding: diff --git a/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java index 6c099cfe01492..394d2e6fbcdab 100644 --- a/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java +++ b/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.breaker; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.Locale; @@ -50,7 +50,7 @@ public static Type parseValue(String value) { case "memory": return Type.MEMORY; default: - throw new ElasticsearchIllegalArgumentException("No CircuitBreaker with type: " + value); + throw new IllegalArgumentException("No CircuitBreaker with type: " + value); } } } diff --git a/src/main/java/org/elasticsearch/common/bytes/BytesArray.java b/src/main/java/org/elasticsearch/common/bytes/BytesArray.java index c748ade21f95d..aa2860eb2b3cc 100644 --- a/src/main/java/org/elasticsearch/common/bytes/BytesArray.java +++ b/src/main/java/org/elasticsearch/common/bytes/BytesArray.java @@ -21,7 +21,7 @@ import com.google.common.base.Charsets; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.Channels; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.StreamInput; @@ -90,7 +90,7 @@ public int length() { @Override public BytesReference slice(int from, int length) { if (from < 0 || (from + length) > this.length) { - throw new ElasticsearchIllegalArgumentException("can't slice a buffer with length [" + this.length + "], with slice parameters from [" + from + "], length [" + length + "]"); + throw new IllegalArgumentException("can't slice a buffer with length [" + this.length + "], with slice parameters from [" + from + "], length [" + length + "]"); } return new BytesArray(bytes, offset + from, length); } diff --git a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java index 6c74029f9f59b..ab3f1e8ae91d1 100644 --- a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java +++ b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.Channels; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.netty.NettyUtils; @@ -74,7 +74,7 @@ public int length() { @Override public BytesReference slice(int from, int length) { if (from < 0 || (from + length) > length()) { - throw new ElasticsearchIllegalArgumentException("can't slice a buffer with length [" + length() + "], with slice parameters from [" + from + "], length [" + length + "]"); + throw new IllegalArgumentException("can't slice a buffer with length [" + length() + "], with slice parameters from [" + from + "], length [" + length + "]"); } return new PagedBytesReference(bigarrays, bytearray, offset + from, length); diff --git a/src/main/java/org/elasticsearch/common/cli/CliTool.java b/src/main/java/org/elasticsearch/common/cli/CliTool.java index eb0faf91d0ac9..092fd0e2e3a30 100644 --- a/src/main/java/org/elasticsearch/common/cli/CliTool.java +++ b/src/main/java/org/elasticsearch/common/cli/CliTool.java @@ -23,7 +23,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; @@ -146,7 +146,7 @@ public final int execute(String... args) { } catch (IOException ioe) { terminal.printError(ioe); return ExitStatus.IO_ERROR.status; - } catch (IllegalArgumentException | ElasticsearchIllegalArgumentException ilae) { + } catch (IllegalArgumentException ilae) { terminal.printError(ilae); return ExitStatus.USAGE.status; } catch (Throwable t) { diff --git a/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/src/main/java/org/elasticsearch/common/collect/HppcMaps.java index 6d3070cfbab6b..28cc9a5483c27 100644 --- a/src/main/java/org/elasticsearch/common/collect/HppcMaps.java +++ b/src/main/java/org/elasticsearch/common/collect/HppcMaps.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.ObjectLookupContainer; import com.carrotsearch.hppc.ObjectObjectOpenHashMap; import com.carrotsearch.hppc.cursors.ObjectCursor; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.Iterator; @@ -72,7 +72,7 @@ public static ObjectObjectOpenHashMap ensureNoNullKeys(int capacity @Override public V put(K key, V value) { if (key == null) { - throw new ElasticsearchIllegalArgumentException("Map key must not be null"); + throw new IllegalArgumentException("Map key must not be null"); } return super.put(key, value); } @@ -134,7 +134,7 @@ public static ObjectIntOpenHashMap ensureNoNullKeys(int capacity, float l @Override public int put(V key, int value) { if (key == null) { - throw new ElasticsearchIllegalArgumentException("Map key must not be null"); + throw new IllegalArgumentException("Map key must not be null"); } return super.put(key, value); } diff --git a/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/src/main/java/org/elasticsearch/common/component/Lifecycle.java index 92bc7aa4782f3..146a4adcb202c 100644 --- a/src/main/java/org/elasticsearch/common/component/Lifecycle.java +++ b/src/main/java/org/elasticsearch/common/component/Lifecycle.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.component; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; /** * Lifecycle state. Allows the following transitions: @@ -105,7 +105,7 @@ public boolean stoppedOrClosed() { return state == State.STOPPED || state == State.CLOSED; } - public boolean canMoveToStarted() throws ElasticsearchIllegalStateException { + public boolean canMoveToStarted() throws IllegalStateException { State localState = this.state; if (localState == State.INITIALIZED || localState == State.STOPPED) { return true; @@ -114,13 +114,13 @@ public boolean canMoveToStarted() throws ElasticsearchIllegalStateException { return false; } if (localState == State.CLOSED) { - throw new ElasticsearchIllegalStateException("Can't move to started state when closed"); + throw new IllegalStateException("Can't move to started state when closed"); } - throw new ElasticsearchIllegalStateException("Can't move to started with unknown state"); + throw new IllegalStateException("Can't move to started with unknown state"); } - public boolean moveToStarted() throws ElasticsearchIllegalStateException { + public boolean moveToStarted() throws IllegalStateException { State localState = this.state; if (localState == State.INITIALIZED || localState == State.STOPPED) { state = State.STARTED; @@ -130,12 +130,12 @@ public boolean moveToStarted() throws ElasticsearchIllegalStateException { return false; } if (localState == State.CLOSED) { - throw new ElasticsearchIllegalStateException("Can't move to started state when closed"); + throw new IllegalStateException("Can't move to started state when closed"); } - throw new ElasticsearchIllegalStateException("Can't move to started with unknown state"); + throw new IllegalStateException("Can't move to started with unknown state"); } - public boolean canMoveToStopped() throws ElasticsearchIllegalStateException { + public boolean canMoveToStopped() throws IllegalStateException { State localState = state; if (localState == State.STARTED) { return true; @@ -144,12 +144,12 @@ public boolean canMoveToStopped() throws ElasticsearchIllegalStateException { return false; } if (localState == State.CLOSED) { - throw new ElasticsearchIllegalStateException("Can't move to started state when closed"); + throw new IllegalStateException("Can't move to started state when closed"); } - throw new ElasticsearchIllegalStateException("Can't move to started with unknown state"); + throw new IllegalStateException("Can't move to started with unknown state"); } - public boolean moveToStopped() throws ElasticsearchIllegalStateException { + public boolean moveToStopped() throws IllegalStateException { State localState = state; if (localState == State.STARTED) { state = State.STOPPED; @@ -159,30 +159,30 @@ public boolean moveToStopped() throws ElasticsearchIllegalStateException { return false; } if (localState == State.CLOSED) { - throw new ElasticsearchIllegalStateException("Can't move to started state when closed"); + throw new IllegalStateException("Can't move to started state when closed"); } - throw new ElasticsearchIllegalStateException("Can't move to started with unknown state"); + throw new IllegalStateException("Can't move to started with unknown state"); } - public boolean canMoveToClosed() throws ElasticsearchIllegalStateException { + public boolean canMoveToClosed() throws IllegalStateException { State localState = state; if (localState == State.CLOSED) { return false; } if (localState == State.STARTED) { - throw new ElasticsearchIllegalStateException("Can't move to closed before moving to stopped mode"); + throw new IllegalStateException("Can't move to closed before moving to stopped mode"); } return true; } - public boolean moveToClosed() throws ElasticsearchIllegalStateException { + public boolean moveToClosed() throws IllegalStateException { State localState = state; if (localState == State.CLOSED) { return false; } if (localState == State.STARTED) { - throw new ElasticsearchIllegalStateException("Can't move to closed before moving to stopped mode"); + throw new IllegalStateException("Can't move to closed before moving to stopped mode"); } state = State.CLOSED; return true; diff --git a/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/src/main/java/org/elasticsearch/common/geo/GeoDistance.java index 96dac682de5a4..0f44b5738a62a 100644 --- a/src/main/java/org/elasticsearch/common/geo/GeoDistance.java +++ b/src/main/java/org/elasticsearch/common/geo/GeoDistance.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.SloppyMath; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.GeoPointValues; @@ -203,7 +203,7 @@ public static GeoDistance fromString(String name) { } else if ("factor".equals(name)) { return FACTOR; } - throw new ElasticsearchIllegalArgumentException("No geo distance for [" + name + "]"); + throw new IllegalArgumentException("No geo distance for [" + name + "]"); } public static interface FixedSourceDistance { diff --git a/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java index d679d2dd943aa..8e908012d8a1e 100644 --- a/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java +++ b/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java @@ -17,7 +17,7 @@ package org.elasticsearch.common.geo; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.ArrayList; import java.util.Collection; @@ -285,7 +285,7 @@ private static final int decode(char geo) { case 'z': return 31; default: - throw new ElasticsearchIllegalArgumentException("the character '" + geo + "' is not a valid geohash character"); + throw new IllegalArgumentException("the character '" + geo + "' is not a valid geohash character"); } } @@ -354,7 +354,7 @@ private static double[] decodeCell(String geohash) { public static long encodeAsLong(double latitude, double longitude, int precision) { if((precision>12)||(precision<1)) { - throw new ElasticsearchIllegalArgumentException("Illegal precision length of "+precision+ + throw new IllegalArgumentException("Illegal precision length of "+precision+ ". Long-based geohashes only support precisions between 1 and 12"); } double latInterval0 = -90.0; diff --git a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java index 22b6ee074ff73..ead682293b6d2 100644 --- a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java +++ b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java @@ -27,7 +27,7 @@ import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; import org.apache.commons.lang3.tuple.Pair; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLoggerFactory; @@ -256,7 +256,7 @@ private static CoordinateNode parseCoordinates(XContentParser parser) throws IOE } return new CoordinateNode(new Coordinate(lon, lat)); } else if (token == XContentParser.Token.VALUE_NULL) { - throw new ElasticsearchIllegalArgumentException("coordinates cannot contain NULL values)"); + throw new IllegalArgumentException("coordinates cannot contain NULL values)"); } List nodes = new ArrayList<>(); @@ -703,7 +703,7 @@ public static GeoShapeType forName(String geoshapename) { return type; } } - throw new ElasticsearchIllegalArgumentException("unknown geo_shape ["+geoshapename+"]"); + throw new IllegalArgumentException("unknown geo_shape ["+geoshapename+"]"); } public static ShapeBuilder parse(XContentParser parser) throws IOException { diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java index af21524aa509b..991e74d308017 100644 --- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -61,8 +61,8 @@ import org.apache.lucene.util.Counter; import org.apache.lucene.util.Version; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -513,7 +513,7 @@ public static void writeFieldDoc(StreamOutput out, FieldDoc fieldDoc) throws IOE public static void writeScoreDoc(StreamOutput out, ScoreDoc scoreDoc) throws IOException { if (!scoreDoc.getClass().equals(ScoreDoc.class)) { - throw new ElasticsearchIllegalArgumentException("This method can only be used to serialize a ScoreDoc, not a " + scoreDoc.getClass()); + throw new IllegalArgumentException("This method can only be used to serialize a ScoreDoc, not a " + scoreDoc.getClass()); } out.writeVInt(scoreDoc.doc); out.writeFloat(scoreDoc.score); @@ -699,27 +699,27 @@ public static Scorer illegalScorer(final String message) { return new Scorer(null) { @Override public float score() throws IOException { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } @Override public int freq() throws IOException { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } @Override public int advance(int arg0) throws IOException { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } @Override public long cost() { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } @Override public int docID() { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } @Override public int nextDoc() throws IOException { - throw new ElasticsearchIllegalStateException(message); + throw new IllegalStateException(message); } }; } diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java b/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java index 2ff71b2f1def8..77ef6feeb6496 100644 --- a/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java +++ b/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.lucene.all; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.io.FastCharArrayWriter; import org.elasticsearch.common.io.FastStringReader; @@ -111,7 +111,7 @@ public void reset() { entry.reader().reset(); } } catch (IOException e) { - throw new ElasticsearchIllegalStateException("should not happen"); + throw new IllegalStateException("should not happen"); } it = entries.iterator(); if (it.hasNext()) { diff --git a/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java b/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java index 82b57e4e452e0..9afdc2dd90b6b 100644 --- a/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java +++ b/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java @@ -28,8 +28,8 @@ import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.RoaringDocIdSet; import org.apache.lucene.util.SparseFixedBitSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import java.io.IOException; @@ -129,7 +129,7 @@ public static Bits asSequentialAccessBits(final int maxDoc, @Nullable DocIdSet s @Override public boolean get(int index) { if (index < previous) { - throw new ElasticsearchIllegalArgumentException("This Bits instance can only be consumed in order. " + throw new IllegalArgumentException("This Bits instance can only be consumed in order. " + "Got called on [" + index + "] while previously called on [" + previous + "]"); } previous = index; @@ -139,7 +139,7 @@ public boolean get(int index) { try { doc = iterator.advance(index); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot advance iterator", e); + throw new IllegalStateException("Cannot advance iterator", e); } } return index == doc; diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java index 9531f8ea77fce..fc956703826f8 100644 --- a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java +++ b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.docset.DocIdSets; @@ -69,7 +69,7 @@ static class Holder { public FilterableTermsEnum(IndexReader reader, String field, int docsEnumFlag, @Nullable final Filter filter) throws IOException { if ((docsEnumFlag != PostingsEnum.FREQS) && (docsEnumFlag != PostingsEnum.NONE)) { - throw new ElasticsearchIllegalArgumentException("invalid docsEnumFlag of " + docsEnumFlag); + throw new IllegalArgumentException("invalid docsEnumFlag of " + docsEnumFlag); } this.docsEnumFlag = docsEnumFlag; if (filter == null) { diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java b/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java index 6a36198e38671..a1bc0d611083e 100644 --- a/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java +++ b/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.io.IOException; @@ -37,7 +37,7 @@ public class WeightFactorFunction extends ScoreFunction { public WeightFactorFunction(float weight, ScoreFunction scoreFunction) { super(CombineFunction.MULT); if (scoreFunction instanceof BoostScoreFunction) { - throw new ElasticsearchIllegalArgumentException(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE); + throw new IllegalArgumentException(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE); } if (scoreFunction == null) { this.scoreFunction = SCORE_ONE; diff --git a/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java index 07298b8e3e217..179237a5d27fd 100644 --- a/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java +++ b/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.recycler; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.util.Deque; @@ -89,7 +89,7 @@ public boolean isRecycled() { @Override public void close() { if (value == null) { - throw new ElasticsearchIllegalStateException("recycler entry already released..."); + throw new IllegalStateException("recycler entry already released..."); } final boolean recycle = beforeRelease(); if (recycle) { diff --git a/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java index f347a73960713..35a943da48c0d 100644 --- a/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java +++ b/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.recycler; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; /** */ @@ -60,7 +60,7 @@ public boolean isRecycled() { @Override public void close() { if (value == null) { - throw new ElasticsearchIllegalStateException("recycler entry already released..."); + throw new IllegalStateException("recycler entry already released..."); } value = null; } diff --git a/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/src/main/java/org/elasticsearch/common/recycler/Recyclers.java index da52666451396..67f29c21130f1 100644 --- a/src/main/java/org/elasticsearch/common/recycler/Recyclers.java +++ b/src/main/java/org/elasticsearch/common/recycler/Recyclers.java @@ -22,9 +22,7 @@ import com.carrotsearch.hppc.hash.MurmurHash3; import com.google.common.collect.Queues; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; - -import java.lang.ref.SoftReference; +import java.lang.IllegalArgumentException; public enum Recyclers { ; @@ -155,7 +153,7 @@ public boolean isRecycled() { */ public static Recycler concurrent(final Recycler.Factory factory, final int concurrencyLevel) { if (concurrencyLevel < 1) { - throw new ElasticsearchIllegalArgumentException("concurrencyLevel must be >= 1"); + throw new IllegalArgumentException("concurrencyLevel must be >= 1"); } if (concurrencyLevel == 1) { return locked(factory.build()); diff --git a/src/main/java/org/elasticsearch/common/regex/Regex.java b/src/main/java/org/elasticsearch/common/regex/Regex.java index 67f4f13c42050..63bbb573227b1 100644 --- a/src/main/java/org/elasticsearch/common/regex/Regex.java +++ b/src/main/java/org/elasticsearch/common/regex/Regex.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.regex; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import java.util.Locale; @@ -154,7 +154,7 @@ public static int flagsFromString(String flags) { } else if ("UNICODE_CHAR_CLASS".equals(s)) { pFlags |= UNICODE_CHARACTER_CLASS; } else { - throw new ElasticsearchIllegalArgumentException("Unknown regex flag [" + s + "]"); + throw new IllegalArgumentException("Unknown regex flag [" + s + "]"); } } return pFlags; diff --git a/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java b/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java index 02a9725b37bc7..98b7f0ecfb744 100644 --- a/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java +++ b/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.rounding; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; @@ -60,7 +60,7 @@ public Builder(DateTimeUnit unit) { public Builder(TimeValue interval) { this.unit = null; if (interval.millis() < 1) - throw new ElasticsearchIllegalArgumentException("Zero or negative time interval not supported"); + throw new IllegalArgumentException("Zero or negative time interval not supported"); this.interval = interval.millis(); } @@ -169,7 +169,7 @@ static class TimeIntervalRounding extends TimeZoneRounding { TimeIntervalRounding(long interval, DateTimeZone timeZone) { if (interval < 1) - throw new ElasticsearchIllegalArgumentException("Zero or negative time interval not supported"); + throw new IllegalArgumentException("Zero or negative time interval not supported"); this.interval = interval; this.timeZone = timeZone; } diff --git a/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java b/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java index eca908ddae95f..296a0e9b51358 100644 --- a/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java +++ b/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java @@ -25,7 +25,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Classes; @@ -506,7 +506,7 @@ public Map getGroups(String settingPrefix) throws SettingsExce @Override public Map getGroups(String settingPrefix, boolean ignoreNonGrouped) throws SettingsException { if (!Strings.hasLength(settingPrefix)) { - throw new ElasticsearchIllegalArgumentException("illegal setting prefix " + settingPrefix); + throw new IllegalArgumentException("illegal setting prefix " + settingPrefix); } if (settingPrefix.charAt(settingPrefix.length() - 1) != '.') { settingPrefix = settingPrefix + "."; @@ -695,7 +695,7 @@ public Builder put(Object... settings) { } } if ((settings.length % 2) != 0) { - throw new ElasticsearchIllegalArgumentException("array settings of key + value order doesn't hold correct number of arguments (" + settings.length + ")"); + throw new IllegalArgumentException("array settings of key + value order doesn't hold correct number of arguments (" + settings.length + ")"); } for (int i = 0; i < settings.length; i++) { put(settings[i++].toString(), settings[i].toString()); @@ -919,7 +919,7 @@ public Builder loadFromDelimitedString(String value, char delimiter) { for (String s : values) { int index = s.indexOf('='); if (index == -1) { - throw new ElasticsearchIllegalArgumentException("value [" + s + "] for settings loaded with delimiter [" + delimiter + "] is malformed, missing ="); + throw new IllegalArgumentException("value [" + s + "] for settings loaded with delimiter [" + delimiter + "] is malformed, missing ="); } map.put(s.substring(0, index), s.substring(index + 1)); } diff --git a/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java b/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java index 242000baad275..c75cedd1d6a6c 100644 --- a/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java +++ b/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.transport; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.logging.ESLogger; @@ -57,7 +57,7 @@ public abstract class TransportAddressSerializers { public static synchronized void addAddressType(TransportAddress address) throws Exception { if (addressConstructors.containsKey(address.uniqueAddressTypeId())) { - throw new ElasticsearchIllegalStateException("Address [" + address.uniqueAddressTypeId() + "] already bound"); + throw new IllegalStateException("Address [" + address.uniqueAddressTypeId() + "] already bound"); } Constructor constructor = address.getClass().getDeclaredConstructor(); constructor.setAccessible(true); diff --git a/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java index 539b25de9b258..37c76d2b86578 100644 --- a/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java +++ b/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -52,10 +52,10 @@ public ByteSizeValue(long size, ByteSizeUnit sizeUnit) { this.sizeUnit = sizeUnit; } - public int bytesAsInt() throws ElasticsearchIllegalArgumentException { + public int bytesAsInt() throws IllegalArgumentException { long bytes = bytes(); if (bytes > Integer.MAX_VALUE) { - throw new ElasticsearchIllegalArgumentException("size [" + toString() + "] is bigger than max int"); + throw new IllegalArgumentException("size [" + toString() + "] is bigger than max int"); } return (int) bytes; } diff --git a/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java index 25eb6680acae2..8ffec08d4c4b5 100644 --- a/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java +++ b/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -179,7 +179,7 @@ public double parse(String distance, DistanceUnit defaultUnit) { * * @param unit name of the unit * @return unit matching the given name - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException if no unit matches the given name + * @throws IllegalArgumentException if no unit matches the given name */ public static DistanceUnit fromString(String unit) { for (DistanceUnit dunit : values()) { @@ -189,7 +189,7 @@ public static DistanceUnit fromString(String unit) { } } } - throw new ElasticsearchIllegalArgumentException("No distance unit match [" + unit + "]"); + throw new IllegalArgumentException("No distance unit match [" + unit + "]"); } /** @@ -233,7 +233,7 @@ public static DistanceUnit readDistanceUnit(StreamInput in) throws IOException { byte b = in.readByte(); if(b<0 || b>=values().length) { - throw new ElasticsearchIllegalArgumentException("No type for distance unit matching [" + b + "]"); + throw new IllegalArgumentException("No type for distance unit matching [" + b + "]"); } else { return values()[b]; } diff --git a/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/src/main/java/org/elasticsearch/common/unit/Fuzziness.java index 712b37abcf906..a1d1bb76d21ad 100644 --- a/src/main/java/org/elasticsearch/common/unit/Fuzziness.java +++ b/src/main/java/org/elasticsearch/common/unit/Fuzziness.java @@ -20,7 +20,7 @@ import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.util.automaton.LevenshteinAutomata; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.xcontent.ToXContent; @@ -111,7 +111,7 @@ public static Fuzziness parse(XContentParser parser) throws IOException { } default: - throw new ElasticsearchIllegalArgumentException("Can't parse fuzziness on token: [" + token + "]"); + throw new IllegalArgumentException("Can't parse fuzziness on token: [" + token + "]"); } } @@ -243,7 +243,7 @@ public float asSimilarity(String text) { return similarity; } } - throw new ElasticsearchIllegalArgumentException("Can't get similarity from fuzziness [" + fuzziness + "]"); + throw new IllegalArgumentException("Can't get similarity from fuzziness [" + fuzziness + "]"); } private int termLen(String text) { diff --git a/src/main/java/org/elasticsearch/common/util/BloomFilter.java b/src/main/java/org/elasticsearch/common/util/BloomFilter.java index 6df7477a9cbc7..5137a04321035 100644 --- a/src/main/java/org/elasticsearch/common/util/BloomFilter.java +++ b/src/main/java/org/elasticsearch/common/util/BloomFilter.java @@ -25,7 +25,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.hash.MurmurHash3; @@ -486,7 +486,7 @@ public static Hashing fromType(int type) { } if (type == 1) { return Hashing.V1; } else { - throw new ElasticsearchIllegalArgumentException("no hashing type matching " + type); + throw new IllegalArgumentException("no hashing type matching " + type); } } } diff --git a/src/main/java/org/elasticsearch/common/util/LocaleUtils.java b/src/main/java/org/elasticsearch/common/util/LocaleUtils.java index 50f494f2d5a88..65c99da43c59b 100644 --- a/src/main/java/org/elasticsearch/common/util/LocaleUtils.java +++ b/src/main/java/org/elasticsearch/common/util/LocaleUtils.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.Locale; @@ -47,7 +47,7 @@ public static Locale parse(String localeStr) { // lang return new Locale(parts[0]); default: - throw new ElasticsearchIllegalArgumentException("Can't parse locale: [" + localeStr + "]"); + throw new IllegalArgumentException("Can't parse locale: [" + localeStr + "]"); } } diff --git a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java index 02d35ac0dcb8b..527bb58f2b85f 100644 --- a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java +++ b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.Lock; import org.apache.lucene.store.SimpleFSDirectory; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -127,7 +127,7 @@ public void checkIndex(ShardPath targetPath) throws IOException { out.flush(); if (!status.clean) { logger.warn("check index [failure]\n{}", new String(os.bytes().toBytes(), Charsets.UTF_8)); - throw new ElasticsearchIllegalStateException("index check failure"); + throw new IllegalStateException("index check failure"); } } } diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java b/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java index bfd530c856ec8..29247e5939ccd 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; @@ -36,7 +36,7 @@ public final class CountDown { public CountDown(int count) { if (count < 0) { - throw new ElasticsearchIllegalArgumentException("count must be greater or equal to 0 but was: " + count); + throw new IllegalArgumentException("count must be greater or equal to 0 but was: " + count); } this.originalCount = count; this.countDown = new AtomicInteger(count); diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java index cf6239445d8c1..77f81b85d3948 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.metrics.CounterMetric; import java.util.concurrent.BlockingQueue; @@ -38,13 +38,13 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { if (((AbstractRunnable) r).isForceExecution()) { BlockingQueue queue = executor.getQueue(); if (!(queue instanceof SizeBlockingQueue)) { - throw new ElasticsearchIllegalStateException("forced execution, but expected a size queue"); + throw new IllegalStateException("forced execution, but expected a size queue"); } try { ((SizeBlockingQueue) queue).forcePut(r); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new ElasticsearchIllegalStateException("forced execution, but got interrupted", e); + throw new IllegalStateException("forced execution, but got interrupted", e); } return; } diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java index e727d35304d69..94d82b773622b 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -19,8 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ElasticsearchIllegalStateException; -import org.elasticsearch.action.ActionRunnable; +import java.lang.IllegalStateException; import java.util.concurrent.*; @@ -44,7 +43,7 @@ public class EsThreadPoolExecutor extends ThreadPoolExecutor { public void shutdown(ShutdownListener listener) { synchronized (monitor) { if (this.listener != null) { - throw new ElasticsearchIllegalStateException("Shutdown was already called on this thread pool"); + throw new IllegalStateException("Shutdown was already called on this thread pool"); } if (isTerminated()) { listener.onTerminated(); diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java index 523f7b92f741f..c9fb994985d89 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; @@ -60,7 +60,7 @@ public void acquire(T key) { while (true) { if (threadLocal.get() != null) { // if we are here, the thread already has the lock - throw new ElasticsearchIllegalStateException("Lock already acquired in Thread" + Thread.currentThread().getId() + throw new IllegalStateException("Lock already acquired in Thread" + Thread.currentThread().getId() + " for key " + key); } KeyLock perNodeLock = map.get(key); @@ -86,7 +86,7 @@ public void acquire(T key) { public void release(T key) { KeyLock lock = threadLocal.get(); if (lock == null) { - throw new ElasticsearchIllegalStateException("Lock not acquired"); + throw new IllegalStateException("Lock not acquired"); } release(key, lock); } @@ -152,7 +152,7 @@ public void acquire(T key) { public void release(T key) { KeyLock keyLock = threadLocal.get(); if (keyLock == null) { - throw new ElasticsearchIllegalStateException("Lock not acquired"); + throw new IllegalStateException("Lock not acquired"); } try { release(key, keyLock); diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java b/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java index f174d2e82b628..4d9796981617e 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.util.AbstractQueue; import java.util.Collection; @@ -146,13 +146,13 @@ public boolean offer(E e) { @Override public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException { // note, not used in ThreadPoolExecutor - throw new ElasticsearchIllegalStateException("offer with timeout not allowed on size queue"); + throw new IllegalStateException("offer with timeout not allowed on size queue"); } @Override public void put(E e) throws InterruptedException { // note, not used in ThreadPoolExecutor - throw new ElasticsearchIllegalStateException("put not allowed on size queue"); + throw new IllegalStateException("put not allowed on size queue"); } @Override diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java b/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java index a0e7c9e0742e2..89b71b60d5726 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java @@ -26,10 +26,6 @@ */ public class UncategorizedExecutionException extends ElasticsearchException { - public UncategorizedExecutionException(String msg) { - super(msg); - } - public UncategorizedExecutionException(String msg, Throwable cause) { super(msg, cause); } diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java index 61cdc84f0b85b..e43eb769e65a7 100644 --- a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java +++ b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.dataformat.cbor.CBORConstants; import com.fasterxml.jackson.dataformat.smile.SmileConstants; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -111,7 +111,7 @@ public static XContentBuilder contentBuilder(XContentType type, OutputStream out } else if (type == XContentType.CBOR) { return cborBuilder(outputStream); } - throw new ElasticsearchIllegalArgumentException("No matching content type for " + type); + throw new IllegalArgumentException("No matching content type for " + type); } /** @@ -127,7 +127,7 @@ public static XContentBuilder contentBuilder(XContentType type) throws IOExcepti } else if (type == XContentType.CBOR) { return CborXContent.contentBuilder(); } - throw new ElasticsearchIllegalArgumentException("No matching content type for " + type); + throw new IllegalArgumentException("No matching content type for " + type); } /** diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java index 321b3bbe225f2..ccd2ca1ae2c6e 100644 --- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java +++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.JsonToken; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.AbstractXContentParser; @@ -204,7 +204,7 @@ private NumberType convertNumberType(JsonParser.NumberType numberType) { case DOUBLE: return NumberType.DOUBLE; } - throw new ElasticsearchIllegalStateException("No matching token for number_type [" + numberType + "]"); + throw new IllegalStateException("No matching token for number_type [" + numberType + "]"); } private Token convertToken(JsonToken token) { @@ -235,6 +235,6 @@ private Token convertToken(JsonToken token) { case VALUE_EMBEDDED_OBJECT: return Token.VALUE_EMBEDDED_OBJECT; } - throw new ElasticsearchIllegalStateException("No matching token for json_token [" + token + "]"); + throw new IllegalStateException("No matching token for json_token [" + token + "]"); } } diff --git a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java index 420e6a399d163..95b1c0ba2d9be 100644 --- a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java +++ b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.common.component.AbstractComponent; @@ -95,7 +95,7 @@ private ClusterBlock parseNoMasterBlock(String value) { case "write": return NO_MASTER_BLOCK_WRITES; default: - throw new ElasticsearchIllegalArgumentException("invalid master block [" + value + "]"); + throw new IllegalArgumentException("invalid master block [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java index e3f4b17910b56..c04cd6f8194e0 100644 --- a/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java @@ -21,7 +21,7 @@ import com.google.common.base.Objects; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlocks; @@ -276,7 +276,7 @@ public String nodeDescription() { @Override public void publish(ClusterState clusterState, final Discovery.AckListener ackListener) { if (!master) { - throw new ElasticsearchIllegalStateException("Shouldn't publish state when not master"); + throw new IllegalStateException("Shouldn't publish state when not master"); } LocalDiscovery[] members = members(); if (members.length > 0) { @@ -379,7 +379,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS } catch (Exception e) { // failure to marshal or un-marshal - throw new ElasticsearchIllegalStateException("Cluster state failed to serialize", e); + throw new IllegalStateException("Cluster state failed to serialize", e); } } diff --git a/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java b/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java index 40f5f56dc8018..2f8ac0073d390 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java +++ b/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java @@ -18,27 +18,19 @@ */ package org.elasticsearch.discovery.zen; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; /** * Thrown when a node join request or a master ping reaches a node which is not * currently acting as a master. */ -public class NotMasterException extends ElasticsearchIllegalStateException { - - public NotMasterException() { - super(null); - } +public class NotMasterException extends IllegalStateException { public NotMasterException(String msg) { super(msg); } - public NotMasterException(String msg, Throwable cause) { - super(msg, cause); - } - @Override public Throwable fillInStackTrace() { return null; diff --git a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index 9ad4945844afb..d2271a92b6b62 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -23,8 +23,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlocks; @@ -173,10 +173,10 @@ public ZenDiscovery(Settings settings, ClusterName clusterName, ThreadPool threa this.rejoinOnMasterGone = settings.getAsBoolean(SETTING_REJOIN_ON_MASTER_GONE, true); if (this.joinRetryAttempts < 1) { - throw new ElasticsearchIllegalArgumentException("'" + SETTING_JOIN_RETRY_ATTEMPTS + "' must be a positive number. got [" + SETTING_JOIN_RETRY_ATTEMPTS + "]"); + throw new IllegalArgumentException("'" + SETTING_JOIN_RETRY_ATTEMPTS + "' must be a positive number. got [" + SETTING_JOIN_RETRY_ATTEMPTS + "]"); } if (this.maxPingsFromAnotherMaster < 1) { - throw new ElasticsearchIllegalArgumentException("'" + SETTING_MAX_PINGS_FROM_ANOTHER_MASTER + "' must be a positive number. got [" + this.maxPingsFromAnotherMaster + "]"); + throw new IllegalArgumentException("'" + SETTING_MAX_PINGS_FROM_ANOTHER_MASTER + "' must be a positive number. got [" + this.maxPingsFromAnotherMaster + "]"); } logger.debug("using ping.timeout [{}], join.timeout [{}], master_election.filter_client [{}], master_election.filter_data [{}]", pingTimeout, joinTimeout, masterElectionFilterClientNodes, masterElectionFilterDataNodes); @@ -333,7 +333,7 @@ public boolean nodeHasJoinedClusterOnce() { @Override public void publish(ClusterState clusterState, AckListener ackListener) { if (!clusterState.getNodes().localNodeMaster()) { - throw new ElasticsearchIllegalStateException("Shouldn't publish state when not master"); + throw new IllegalStateException("Shouldn't publish state when not master"); } nodesFD.updateNodesAndPing(clusterState); publishClusterState.publish(clusterState, ackListener); @@ -706,7 +706,7 @@ void handleNewClusterStateFromMaster(ClusterState newClusterState, final Publish /* The cluster name can still be null if the state comes from a node that is prev 1.1.1*/ if (incomingClusterName != null && !incomingClusterName.equals(this.clusterName)) { logger.warn("received cluster state from [{}] which is also master but with a different cluster name [{}]", newClusterState.nodes().masterNode(), incomingClusterName); - newStateProcessed.onNewClusterStateFailed(new ElasticsearchIllegalStateException("received state from a node that is not part of the cluster")); + newStateProcessed.onNewClusterStateFailed(new IllegalStateException("received state from a node that is not part of the cluster")); return; } if (localNodeMaster()) { @@ -733,7 +733,7 @@ public void onFailure(String source, Throwable t) { } else { if (newClusterState.nodes().localNode() == null) { logger.warn("received a cluster state from [{}] and not part of the cluster, should not happen", newClusterState.nodes().masterNode()); - newStateProcessed.onNewClusterStateFailed(new ElasticsearchIllegalStateException("received state from a node that is not part of the cluster")); + newStateProcessed.onNewClusterStateFailed(new IllegalStateException("received state from a node that is not part of the cluster")); } else { final ProcessClusterState processClusterState = new ProcessClusterState(newClusterState); @@ -879,7 +879,7 @@ static boolean shouldIgnoreOrRejectNewClusterState(ESLogger logger, ClusterState } if (!currentState.nodes().masterNodeId().equals(newClusterState.nodes().masterNodeId())) { logger.warn("received a cluster state from a different master then the current one, rejecting (received {}, current {})", newClusterState.nodes().masterNode(), currentState.nodes().masterNode()); - throw new ElasticsearchIllegalStateException("cluster state from a different master then the current one, rejecting (received " + newClusterState.nodes().masterNode() + ", current " + currentState.nodes().masterNode() + ")"); + throw new IllegalStateException("cluster state from a different master then the current one, rejecting (received " + newClusterState.nodes().masterNode() + ", current " + currentState.nodes().masterNode() + ")"); } else if (newClusterState.version() < currentState.version()) { // if the new state has a smaller version, and it has the same master node, then no need to process it logger.debug("received a cluster state that has a lower version than the current one, ignoring (received {}, current {})", newClusterState.version(), currentState.version()); diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java index d713b6d0b39d0..06a726651303a 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java @@ -20,7 +20,7 @@ package org.elasticsearch.discovery.zen.fd; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; @@ -295,7 +295,7 @@ public String executor() { } /** Thrown when a ping reaches the wrong node */ - static class ThisIsNotTheMasterYouAreLookingForException extends ElasticsearchIllegalStateException { + static class ThisIsNotTheMasterYouAreLookingForException extends IllegalStateException { ThisIsNotTheMasterYouAreLookingForException(String msg) { super(msg); @@ -310,7 +310,7 @@ public Throwable fillInStackTrace() { } } - static class NodeDoesNotExistOnMasterException extends ElasticsearchIllegalStateException { + static class NodeDoesNotExistOnMasterException extends IllegalStateException { @Override public Throwable fillInStackTrace() { return null; @@ -351,7 +351,7 @@ public ClusterState execute(ClusterState currentState) throws Exception { // if we are no longer master, fail... DiscoveryNodes nodes = currentState.nodes(); if (!nodes.localNodeMaster()) { - throw new NotMasterException(); + throw new NotMasterException("local node is not master"); } if (!nodes.nodeExists(request.nodeId)) { throw new NodeDoesNotExistOnMasterException(); diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java index f367db8ca8c4b..667c428992131 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery.zen.fd; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -245,13 +245,13 @@ public void messageReceived(PingRequest request, TransportChannel channel) throw // if we are not the node we are supposed to be pinged, send an exception // this can happen when a kill -9 is sent, and another node is started using the same port if (!localNode.id().equals(request.nodeId)) { - throw new ElasticsearchIllegalStateException("Got pinged as node [" + request.nodeId + "], but I am node [" + localNode.id() + "]"); + throw new IllegalStateException("Got pinged as node [" + request.nodeId + "], but I am node [" + localNode.id() + "]"); } // PingRequest will have clusterName set to null if it came from a node of version <1.4.0 if (request.clusterName != null && !request.clusterName.equals(clusterName)) { // Don't introduce new exception for bwc reasons - throw new ElasticsearchIllegalStateException("Got pinged with cluster name [" + request.clusterName + "], but I'm part of cluster [" + clusterName + "]"); + throw new IllegalStateException("Got pinged with cluster name [" + request.clusterName + "], but I'm part of cluster [" + clusterName + "]"); } notifyPingReceived(request); diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java index 18b6899c02d24..ed32b22d37fb9 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.Nullable; @@ -71,7 +71,7 @@ public ImmutableList zenPings() { @Override public void setPingContextProvider(PingContextProvider contextProvider) { if (lifecycle.started()) { - throw new ElasticsearchIllegalStateException("Can't set nodes provider when started"); + throw new IllegalStateException("Can't set nodes provider when started"); } for (ZenPing zenPing : zenPings) { zenPing.setPingContextProvider(contextProvider); diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java index e5f0f2ffad3e3..8f06abcaca0b0 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.Constants; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; @@ -113,7 +113,7 @@ public MulticastZenPing(Settings settings, ThreadPool threadPool, TransportServi @Override public void setPingContextProvider(PingContextProvider nodesProvider) { if (lifecycle.started()) { - throw new ElasticsearchIllegalStateException("Can't set nodes provider when started"); + throw new IllegalStateException("Can't set nodes provider when started"); } this.contextProvider = nodesProvider; } @@ -406,7 +406,7 @@ public void onMessage(BytesReference data, SocketAddress address) { .createParser(data) .mapAndClose(); } else { - throw new ElasticsearchIllegalStateException("failed multicast message, probably message from previous version"); + throw new IllegalStateException("failed multicast message, probably message from previous version"); } } if (externalPingData != null) { diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java index 3dd2ad6a51d45..6842808c6696f 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java @@ -23,8 +23,8 @@ import com.google.common.collect.Lists; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -130,7 +130,7 @@ public UnicastZenPing(Settings settings, ThreadPool threadPool, TransportService configuredTargetNodes.add(new DiscoveryNode(UNICAST_NODE_PREFIX + unicastNodeIdGenerator.incrementAndGet() + "#", addresses[i], version.minimumCompatibilityVersion())); } } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("Failed to resolve address for [" + host + "]", e); + throw new IllegalArgumentException("Failed to resolve address for [" + host + "]", e); } } this.configuredTargetNodes = configuredTargetNodes.toArray(new DiscoveryNode[configuredTargetNodes.size()]); @@ -462,7 +462,7 @@ public void handleException(TransportException exp) { private UnicastPingResponse handlePingRequest(final UnicastPingRequest request) { if (!lifecycle.started()) { - throw new ElasticsearchIllegalStateException("received ping request while not started"); + throw new IllegalStateException("received ping request while not started"); } temporalResponses.add(request.pingResponse); threadPool.schedule(TimeValue.timeValueMillis(request.timeout.millis() * 2), ThreadPool.Names.SAME, new Runnable() { diff --git a/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/src/main/java/org/elasticsearch/env/NodeEnvironment.java index c9dbf42d3fdd9..2b7db7d7937b9 100644 --- a/src/main/java/org/elasticsearch/env/NodeEnvironment.java +++ b/src/main/java/org/elasticsearch/env/NodeEnvironment.java @@ -23,8 +23,8 @@ import com.google.common.collect.Sets; import org.apache.lucene.store.*; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.component.AbstractComponent; @@ -172,7 +172,7 @@ public NodeEnvironment(Settings settings, Environment environment) throws IOExce } if (locks[0] == null) { - throw new ElasticsearchIllegalStateException("Failed to obtain node lock, is the following location writable?: " + throw new IllegalStateException("Failed to obtain node lock, is the following location writable?: " + Arrays.toString(environment.dataWithClusterFiles()), lastException); } @@ -536,12 +536,12 @@ public boolean hasNodeFile() { /** * Returns an array of all of the nodes data locations. - * @throws org.elasticsearch.ElasticsearchIllegalStateException if the node is not configured to store local locations + * @throws IllegalStateException if the node is not configured to store local locations */ public Path[] nodeDataPaths() { assert assertEnvIsLocked(); if (nodePaths == null || locks == null) { - throw new ElasticsearchIllegalStateException("node is not configured to store local location"); + throw new IllegalStateException("node is not configured to store local location"); } Path[] paths = new Path[nodePaths.length]; for(int i=0;i findAllIndices() throws IOException { if (nodePaths == null || locks == null) { - throw new ElasticsearchIllegalStateException("node is not configured to store local location"); + throw new IllegalStateException("node is not configured to store local location"); } assert assertEnvIsLocked(); Set indices = Sets.newHashSet(); @@ -643,7 +643,7 @@ private boolean assertEnvIsLocked() { /** * This method tries to write an empty file and moves it using an atomic move operation. - * This method throws an {@link ElasticsearchIllegalStateException} if this operation is + * This method throws an {@link IllegalStateException} if this operation is * not supported by the filesystem. This test is executed on each of the data directories. * This method cleans up all files even in the case of an error. */ @@ -657,7 +657,7 @@ public void ensureAtomicMoveSupported() throws IOException { try { Files.move(src, target, StandardCopyOption.ATOMIC_MOVE); } catch (AtomicMoveNotSupportedException ex) { - throw new ElasticsearchIllegalStateException("atomic_move is not supported by the filesystem on path [" + throw new IllegalStateException("atomic_move is not supported by the filesystem on path [" + nodePath.path + "] atomic_move is required for elasticsearch to work correctly.", ex); } finally { @@ -703,7 +703,7 @@ private Path resolveCustomLocation(@IndexSettings Settings indexSettings) { return PathUtils.get(customDataDir); } } else { - throw new ElasticsearchIllegalArgumentException("no custom " + IndexMetaData.SETTING_DATA_PATH + " setting available"); + throw new IllegalArgumentException("no custom " + IndexMetaData.SETTING_DATA_PATH + " setting available"); } } diff --git a/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java index 34503b08ad8aa..c67c91dd6b903 100644 --- a/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java +++ b/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java @@ -20,7 +20,7 @@ package org.elasticsearch.gateway; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterState; @@ -175,7 +175,7 @@ private void ensureNoPre019State() throws Exception { } final String name = stateFile.getFileName().toString(); if (name.startsWith("metadata-")) { - throw new ElasticsearchIllegalStateException("Detected pre 0.19 metadata file please upgrade to a version before " + throw new IllegalStateException("Detected pre 0.19 metadata file please upgrade to a version before " + Version.CURRENT.minimumCompatibilityVersion() + " first to upgrade state structures - metadata found: [" + stateFile.getParent().toAbsolutePath()); } @@ -225,7 +225,7 @@ private void pre20Upgrade() throws Exception { } else if (indexMetaData.getCreationVersion().onOrAfter(Version.V_2_0_0)) { if (indexMetaData.getSettings().get(IndexMetaData.SETTING_LEGACY_ROUTING_HASH_FUNCTION) != null || indexMetaData.getSettings().get(IndexMetaData.SETTING_LEGACY_ROUTING_USE_TYPE) != null) { - throw new ElasticsearchIllegalStateException("Indices created on or after 2.0 should NOT contain [" + IndexMetaData.SETTING_LEGACY_ROUTING_HASH_FUNCTION + throw new IllegalStateException("Indices created on or after 2.0 should NOT contain [" + IndexMetaData.SETTING_LEGACY_ROUTING_HASH_FUNCTION + "] + or [" + IndexMetaData.SETTING_LEGACY_ROUTING_USE_TYPE + "] in their index settings"); } } @@ -244,7 +244,7 @@ private void ensureNoPre019ShardState(NodeEnvironment nodeEnv) throws Exception if (Files.exists(stateLocation)) { try (DirectoryStream stream = Files.newDirectoryStream(stateLocation, "shards-*")) { for (Path stateFile : stream) { - throw new ElasticsearchIllegalStateException("Detected pre 0.19 shard state file please upgrade to a version before " + throw new IllegalStateException("Detected pre 0.19 shard state file please upgrade to a version before " + Version.CURRENT.minimumCompatibilityVersion() + " first to upgrade state structures - shard state found: [" + stateFile.getParent().toAbsolutePath()); } diff --git a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java index 8bfbc5a4e06f3..fe7bdd5ef7397 100644 --- a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java +++ b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexFormatTooOldException; import org.apache.lucene.store.*; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.logging.ESLogger; @@ -300,7 +300,7 @@ public T loadLatestState(ESLogger logger, Path... dataLocations) throws IOExcep ExceptionsHelper.maybeThrowRuntimeAndSuppress(exceptions); if (files.size() > 0) { // We have some state files but none of them gave us a usable state - throw new ElasticsearchIllegalStateException("Could not find a state file to recover from among " + files); + throw new IllegalStateException("Could not find a state file to recover from among " + files); } return state; } diff --git a/src/main/java/org/elasticsearch/index/IndexException.java b/src/main/java/org/elasticsearch/index/IndexException.java index 0f100dcd4f014..2cd1edcd8976e 100644 --- a/src/main/java/org/elasticsearch/index/IndexException.java +++ b/src/main/java/org/elasticsearch/index/IndexException.java @@ -35,7 +35,7 @@ public IndexException(Index index, String msg) { this(index, msg, null); } - protected IndexException(Index index, String msg, Throwable cause) { + public IndexException(Index index, String msg, Throwable cause) { super(msg, cause); this.index = index; } diff --git a/src/main/java/org/elasticsearch/index/IndexService.java b/src/main/java/org/elasticsearch/index/IndexService.java index 878d8162437f0..cc9a571cd9399 100644 --- a/src/main/java/org/elasticsearch/index/IndexService.java +++ b/src/main/java/org/elasticsearch/index/IndexService.java @@ -24,7 +24,7 @@ import com.google.common.collect.Iterators; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -279,7 +279,7 @@ public synchronized IndexShard createShard(int sShardId, boolean primary) throws * keep it synced. */ if (closed.get()) { - throw new ElasticsearchIllegalStateException("Can't create shard [" + index.name() + "][" + sShardId + "], closed"); + throw new IllegalStateException("Can't create shard [" + index.name() + "][" + sShardId + "], closed"); } final ShardId shardId = new ShardId(index, sShardId); ShardLock lock = null; diff --git a/src/main/java/org/elasticsearch/index/VersionType.java b/src/main/java/org/elasticsearch/index/VersionType.java index 327cd6565db16..ad31f4d17d05c 100644 --- a/src/main/java/org/elasticsearch/index/VersionType.java +++ b/src/main/java/org/elasticsearch/index/VersionType.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.uid.Versions; /** @@ -283,7 +283,7 @@ public static VersionType fromString(String versionType) { } else if ("force".equals(versionType)) { return FORCE; } - throw new ElasticsearchIllegalArgumentException("No version type match [" + versionType + "]"); + throw new IllegalArgumentException("No version type match [" + versionType + "]"); } public static VersionType fromString(String versionType, VersionType defaultVersionType) { @@ -303,6 +303,6 @@ public static VersionType fromValue(byte value) { } else if (value == 3) { return FORCE; } - throw new ElasticsearchIllegalArgumentException("No version type match [" + value + "]"); + throw new IllegalArgumentException("No version type match [" + value + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/src/main/java/org/elasticsearch/index/analysis/Analysis.java index 7285840f83cc5..b994d5c230719 100644 --- a/src/main/java/org/elasticsearch/index/analysis/Analysis.java +++ b/src/main/java/org/elasticsearch/index/analysis/Analysis.java @@ -58,8 +58,8 @@ import org.apache.lucene.analysis.tr.TurkishAnalyzer; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.cluster.metadata.IndexMetaData; +import java.lang.IllegalArgumentException; + import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.io.FileSystemUtils; @@ -71,12 +71,8 @@ import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.*; /** @@ -216,7 +212,7 @@ public static CharArraySet getWordSet(Environment env, Settings settings, String * Fetches a list of words from the specified settings file. The list should either be available at the key * specified by settingsPrefix or in a file specified by settingsPrefix + _path. * - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException + * @throws IllegalArgumentException * If the word list cannot be found at either key. */ public static List getWordList(Environment env, Settings settings, String settingPrefix) { @@ -237,7 +233,7 @@ public static List getWordList(Environment env, Settings settings, Strin return loadWordList(reader, "#"); } catch (IOException ioe) { String message = String.format(Locale.ROOT, "IOException while reading %s_path: %s", settingPrefix, ioe.getMessage()); - throw new ElasticsearchIllegalArgumentException(message); + throw new IllegalArgumentException(message); } } @@ -268,7 +264,7 @@ public static List loadWordList(Reader reader, String comment) throws IO /** * @return null If no settings set for "settingsPrefix" then return null. - * @throws org.elasticsearch.ElasticsearchIllegalArgumentException + * @throws IllegalArgumentException * If the Reader can not be instantiated. */ public static Reader getReaderFromFile(Environment env, Settings settings, String settingPrefix) { @@ -284,7 +280,7 @@ public static Reader getReaderFromFile(Environment env, Settings settings, Strin return FileSystemUtils.newBufferedReader(fileUrl, Charsets.UTF_8); } catch (IOException ioe) { String message = String.format(Locale.ROOT, "IOException while reading %s_path: %s", settingPrefix, ioe.getMessage()); - throw new ElasticsearchIllegalArgumentException(message); + throw new IllegalArgumentException(message); } } diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java index 0bd527a2c22e0..d6c881d2f1113 100644 --- a/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java +++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.Scopes; @@ -186,12 +186,12 @@ protected void configure() { } } if (type == null) { - throw new ElasticsearchIllegalArgumentException("failed to find char filter type [" + charFilterSettings.get("type") + "] for [" + charFilterName + "]", e); + throw new IllegalArgumentException("failed to find char filter type [" + charFilterSettings.get("type") + "] for [" + charFilterName + "]", e); } } if (type == null) { // nothing found, see if its in bindings as a binding name - throw new ElasticsearchIllegalArgumentException("Char Filter [" + charFilterName + "] must have a type associated with it"); + throw new IllegalArgumentException("Char Filter [" + charFilterName + "] must have a type associated with it"); } charFilterBinder.addBinding(charFilterName).toProvider(FactoryProvider.newFactory(CharFilterFactoryFactory.class, type)).in(Scopes.SINGLETON); } @@ -246,11 +246,11 @@ protected void configure() { } } if (type == null) { - throw new ElasticsearchIllegalArgumentException("failed to find token filter type [" + tokenFilterSettings.get("type") + "] for [" + tokenFilterName + "]", e); + throw new IllegalArgumentException("failed to find token filter type [" + tokenFilterSettings.get("type") + "] for [" + tokenFilterName + "]", e); } } if (type == null) { - throw new ElasticsearchIllegalArgumentException("token filter [" + tokenFilterName + "] must have a type associated with it"); + throw new IllegalArgumentException("token filter [" + tokenFilterName + "] must have a type associated with it"); } tokenFilterBinder.addBinding(tokenFilterName).toProvider(FactoryProvider.newFactory(TokenFilterFactoryFactory.class, type)).in(Scopes.SINGLETON); } @@ -305,11 +305,11 @@ protected void configure() { } } if (type == null) { - throw new ElasticsearchIllegalArgumentException("failed to find tokenizer type [" + tokenizerSettings.get("type") + "] for [" + tokenizerName + "]", e); + throw new IllegalArgumentException("failed to find tokenizer type [" + tokenizerSettings.get("type") + "] for [" + tokenizerName + "]", e); } } if (type == null) { - throw new ElasticsearchIllegalArgumentException("token filter [" + tokenizerName + "] must have a type associated with it"); + throw new IllegalArgumentException("token filter [" + tokenizerName + "] must have a type associated with it"); } tokenizerBinder.addBinding(tokenizerName).toProvider(FactoryProvider.newFactory(TokenizerFactoryFactory.class, type)).in(Scopes.SINGLETON); } @@ -369,7 +369,7 @@ protected void configure() { // we have a tokenizer, use the CustomAnalyzer type = CustomAnalyzerProvider.class; } else { - throw new ElasticsearchIllegalArgumentException("failed to find analyzer type [" + analyzerSettings.get("type") + "] or tokenizer for [" + analyzerName + "]", e); + throw new IllegalArgumentException("failed to find analyzer type [" + analyzerSettings.get("type") + "] or tokenizer for [" + analyzerName + "]", e); } } } @@ -380,7 +380,7 @@ protected void configure() { // we have a tokenizer, use the CustomAnalyzer type = CustomAnalyzerProvider.class; } else { - throw new ElasticsearchIllegalArgumentException("failed to find analyzer type [" + analyzerSettings.get("type") + "] or tokenizer for [" + analyzerName + "]"); + throw new IllegalArgumentException("failed to find analyzer type [" + analyzerSettings.get("type") + "] or tokenizer for [" + analyzerName + "]"); } } analyzerBinder.addBinding(analyzerName).toProvider(FactoryProvider.newFactory(AnalyzerProviderFactory.class, type)).in(Scopes.SINGLETON); diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java index 3fe8cbd27e5de..055f399393614 100644 --- a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java +++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.analysis.Analyzer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Nullable; @@ -222,7 +222,7 @@ public AnalysisService(Index index, @IndexSettings Settings indexSettings, @Null } Analyzer analyzerF = analyzerFactory.get(); if (analyzerF == null) { - throw new ElasticsearchIllegalArgumentException("analyzer [" + analyzerFactory.name() + "] created null analyzer"); + throw new IllegalArgumentException("analyzer [" + analyzerFactory.name() + "] created null analyzer"); } NamedAnalyzer analyzer; // if we got a named analyzer back, use it... @@ -247,7 +247,7 @@ public AnalysisService(Index index, @IndexSettings Settings indexSettings, @Null defaultAnalyzer = analyzers.get("default"); if (defaultAnalyzer == null) { - throw new ElasticsearchIllegalArgumentException("no default analyzer configured"); + throw new IllegalArgumentException("no default analyzer configured"); } defaultIndexAnalyzer = analyzers.containsKey("default_index") ? analyzers.get("default_index") : analyzers.get("default"); defaultSearchAnalyzer = analyzers.containsKey("default_search") ? analyzers.get("default_search") : analyzers.get("default"); diff --git a/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java index fe56627554fea..93a3e0f21bf22 100644 --- a/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java +++ b/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java @@ -19,9 +19,7 @@ package org.elasticsearch.index.analysis; -import org.apache.lucene.util.Version; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java index 3215bec1d23b6..82cbd7316f0d9 100644 --- a/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java @@ -29,7 +29,7 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * @@ -51,7 +51,7 @@ public CommonGramsTokenFilterFactory(Index index, @IndexSettings Settings indexS this.words = Analysis.parseCommonWords(env, settings, null, ignoreCase); if (this.words == null) { - throw new ElasticsearchIllegalArgumentException("mising or empty [common_words] or [common_words_path] configuration for common_grams token filter"); + throw new IllegalArgumentException("mising or empty [common_words] or [common_words_path] configuration for common_grams token filter"); } } diff --git a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java index 6b14aad567e98..d54b409749026 100644 --- a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java @@ -24,16 +24,14 @@ import org.apache.lucene.analysis.ngram.Lucene43EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.cluster.metadata.IndexMetaData; +import java.lang.IllegalArgumentException; + import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; -import java.io.Reader; - import static org.elasticsearch.index.analysis.NGramTokenizerFactory.parseTokenChars; /** @@ -71,7 +69,7 @@ public Tokenizer create() { * Yet if somebody uses 0.90.2 or higher with a prev. lucene version we should also use the deprecated version. */ if (side == Lucene43EdgeNGramTokenizer.Side.BACK) { - throw new ElasticsearchIllegalArgumentException("side=back is not supported anymore. Please fix your analysis chain or use" + throw new IllegalArgumentException("side=back is not supported anymore. Please fix your analysis chain or use" + " an older compatibility version (<=4.2) but beware that it might cause highlighting bugs." + " To obtain the same behavior as the previous version please use \"edgeNGram\" filter which still supports side=back" + " in combination with a \"keyword\" tokenizer"); diff --git a/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java index 6bdba6617f4b0..9cfa70f284d0f 100644 --- a/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hunspell.Dictionary; import org.apache.lucene.analysis.hunspell.HunspellStemFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -44,12 +44,12 @@ public HunspellTokenFilterFactory(Index index, @IndexSettings Settings indexSett String locale = settings.get("locale", settings.get("language", settings.get("lang", null))); if (locale == null) { - throw new ElasticsearchIllegalArgumentException("missing [locale | language | lang] configuration for hunspell token filter"); + throw new IllegalArgumentException("missing [locale | language | lang] configuration for hunspell token filter"); } dictionary = hunspellService.getDictionary(locale); if (dictionary == null) { - throw new ElasticsearchIllegalArgumentException(String.format(Locale.ROOT, "Unknown hunspell dictionary for locale [%s]", locale)); + throw new IllegalArgumentException(String.format(Locale.ROOT, "Unknown hunspell dictionary for locale [%s]", locale)); } dedup = settings.getAsBoolean("dedup", true); diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java index 47e03fdcbf050..60d907ee9d4f0 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -56,7 +56,7 @@ public KeepTypesFilterFactory(Index index, @IndexSettings Settings indexSettings final String[] arrayKeepTypes = settings.getAsArray(KEEP_TYPES_KEY, null); if ((arrayKeepTypes == null)) { - throw new ElasticsearchIllegalArgumentException("keep_types requires `" + KEEP_TYPES_KEY + "` to be configured"); + throw new IllegalArgumentException("keep_types requires `" + KEEP_TYPES_KEY + "` to be configured"); } this.keepTypes = new HashSet<>(Arrays.asList(arrayKeepTypes)); diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java index e2605d8ea235c..eda197eb210cb 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.miscellaneous.Lucene43KeepWordFilter; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -75,11 +75,11 @@ public KeepWordFilterFactory(Index index, @IndexSettings Settings indexSettings, final String keepWordsPath = settings.get(KEEP_WORDS_PATH_KEY, null); if ((arrayKeepWords == null && keepWordsPath == null) || (arrayKeepWords != null && keepWordsPath != null)) { // we don't allow both or none - throw new ElasticsearchIllegalArgumentException("keep requires either `" + KEEP_WORDS_KEY + "` or `" + throw new IllegalArgumentException("keep requires either `" + KEEP_WORDS_KEY + "` or `" + KEEP_WORDS_PATH_KEY + "` to be configured"); } if (version.onOrAfter(Version.LUCENE_4_4) && settings.get(ENABLE_POS_INC_KEY) != null) { - throw new ElasticsearchIllegalArgumentException(ENABLE_POS_INC_KEY + " is not supported anymore. Please fix your analysis chain or use" + throw new IllegalArgumentException(ENABLE_POS_INC_KEY + " is not supported anymore. Please fix your analysis chain or use" + " an older compatibility version (<=4.3) but beware that it might cause highlighting bugs."); } enablePositionIncrements = version.onOrAfter(Version.LUCENE_4_4) ? true : settings.getAsBoolean(ENABLE_POS_INC_KEY, true); diff --git a/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java index 73f41cdc30514..af5ee8baa1bd5 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.util.CharArraySet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -44,7 +44,7 @@ public KeywordMarkerTokenFilterFactory(Index index, @IndexSettings Settings inde boolean ignoreCase = settings.getAsBoolean("ignore_case", false); Set rules = Analysis.getWordSet(env, settings, "keywords"); if (rules == null) { - throw new ElasticsearchIllegalArgumentException("keyword filter requires either `keywords` or `keywords_path` to be configured"); + throw new IllegalArgumentException("keyword filter requires either `keywords` or `keywords_path` to be configured"); } keywordLookup = new CharArraySet(rules, ignoreCase); } diff --git a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java index aa9868a4fef54..1b38f8f36a61a 100644 --- a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.miscellaneous.LengthFilter; import org.apache.lucene.analysis.miscellaneous.Lucene43LengthFilter; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -46,7 +46,7 @@ public LengthTokenFilterFactory(Index index, @IndexSettings Settings indexSettin min = settings.getAsInt("min", 0); max = settings.getAsInt("max", Integer.MAX_VALUE); if (version.onOrAfter(Version.LUCENE_4_4) && settings.get(ENABLE_POS_INC_KEY) != null) { - throw new ElasticsearchIllegalArgumentException(ENABLE_POS_INC_KEY + " is not supported anymore. Please fix your analysis chain or use" + throw new IllegalArgumentException(ENABLE_POS_INC_KEY + " is not supported anymore. Please fix your analysis chain or use" + " an older compatibility version (<=4.3) but beware that it might cause highlighting bugs."); } enablePositionIncrements = version.onOrAfter(Version.LUCENE_4_4) ? true : settings.getAsBoolean(ENABLE_POS_INC_KEY, true); diff --git a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java index 8c08b82a7bdd1..9a5b26184c873 100644 --- a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.el.GreekLowerCaseFilter; import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -61,7 +61,7 @@ public TokenStream create(TokenStream tokenStream) { } else if (lang.equalsIgnoreCase("turkish")) { return new TurkishLowerCaseFilter(tokenStream); } else { - throw new ElasticsearchIllegalArgumentException("language [" + lang + "] not support for lower case"); + throw new IllegalArgumentException("language [" + lang + "] not support for lower case"); } } } diff --git a/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java index 3b298e65e5693..d5a05155619fa 100644 --- a/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -45,7 +45,7 @@ public MappingCharFilterFactory(Index index, @IndexSettings Settings indexSettin List rules = Analysis.getWordList(env, settings, "mappings"); if (rules == null) { - throw new ElasticsearchIllegalArgumentException("mapping requires either `mappings` or `mappings_path` to be configured"); + throw new IllegalArgumentException("mapping requires either `mappings` or `mappings_path` to be configured"); } NormalizeCharMap.Builder normMapBuilder = new NormalizeCharMap.Builder(); diff --git a/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java index 99da029a98eac..8a9eaebf52ede 100644 --- a/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java @@ -24,15 +24,14 @@ import org.apache.lucene.analysis.ngram.Lucene43NGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.cluster.metadata.IndexMetaData; +import java.lang.IllegalArgumentException; + import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; -import java.io.Reader; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Locale; @@ -83,7 +82,7 @@ static CharMatcher parseTokenChars(String[] characterClasses) { characterClass = characterClass.toLowerCase(Locale.ROOT).trim(); CharMatcher matcher = MATCHERS.get(characterClass); if (matcher == null) { - throw new ElasticsearchIllegalArgumentException("Unknown token type: '" + characterClass + "', must be one of " + MATCHERS.keySet()); + throw new IllegalArgumentException("Unknown token type: '" + characterClass + "', must be one of " + MATCHERS.keySet()); } builder.or(matcher); } diff --git a/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java index fb1fda8ac9dc9..000b2b31d4af3 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.path.PathHierarchyTokenizer; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -46,7 +46,7 @@ public PathHierarchyTokenizerFactory(Index index, @IndexSettings Settings indexS if (delimiter == null) { this.delimiter = PathHierarchyTokenizer.DEFAULT_DELIMITER; } else if (delimiter.length() > 1) { - throw new ElasticsearchIllegalArgumentException("delimiter can only be a one char value"); + throw new IllegalArgumentException("delimiter can only be a one char value"); } else { this.delimiter = delimiter.charAt(0); } @@ -55,7 +55,7 @@ public PathHierarchyTokenizerFactory(Index index, @IndexSettings Settings indexS if (replacement == null) { this.replacement = this.delimiter; } else if (replacement.length() > 1) { - throw new ElasticsearchIllegalArgumentException("replacement can only be a one char value"); + throw new IllegalArgumentException("replacement can only be a one char value"); } else { this.replacement = replacement.charAt(0); } diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java index 1996aff8c92d0..3b06a96baf2ac 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.util.CharArraySet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -57,7 +57,7 @@ public PatternAnalyzerProvider(Index index, @IndexSettings Settings indexSetting String sPattern = settings.get("pattern", "\\W+" /*PatternAnalyzer.NON_WORD_PATTERN*/); if (sPattern == null) { - throw new ElasticsearchIllegalArgumentException("Analyzer [" + name + "] of type pattern must have a `pattern` set"); + throw new IllegalArgumentException("Analyzer [" + name + "] of type pattern must have a `pattern` set"); } Pattern pattern = Regex.compile(sPattern, settings.get("flags")); diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java index 5fd2d5bf0686f..80cd3e90c62b1 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -44,7 +44,7 @@ public PatternCaptureGroupTokenFilterFactory(Index index, @IndexSettings Setting super(index, indexSettings, name, settings); String[] regexes = settings.getAsArray(PATTERNS_KEY, null, false); if (regexes == null) { - throw new ElasticsearchIllegalArgumentException("required setting '" + PATTERNS_KEY + "' is missing for token filter [" + name + "]"); + throw new IllegalArgumentException("required setting '" + PATTERNS_KEY + "' is missing for token filter [" + name + "]"); } patterns = new Pattern[regexes.length]; for (int i = 0; i < regexes.length; i++) { diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java index 25101ddba41ca..5fb0d75f64d95 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -41,7 +41,7 @@ public PatternReplaceCharFilterFactory(Index index, @IndexSettings Settings inde super(index, indexSettings, name); if (!Strings.hasLength(settings.get("pattern"))) { - throw new ElasticsearchIllegalArgumentException("pattern is missing for [" + name + "] char filter of type 'pattern_replace'"); + throw new IllegalArgumentException("pattern is missing for [" + name + "] char filter of type 'pattern_replace'"); } pattern = Pattern.compile(settings.get("pattern")); replacement = settings.get("replacement", ""); // when not set or set to "", use "". diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java index 9cb23bd81a2c1..fef707fe68f7b 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternReplaceFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.regex.Regex; @@ -44,7 +44,7 @@ public PatternReplaceTokenFilterFactory(Index index, @IndexSettings Settings ind String sPattern = settings.get("pattern", null); if (sPattern == null) { - throw new ElasticsearchIllegalArgumentException("pattern is missing for [" + name + "] token filter of type 'pattern_replace'"); + throw new IllegalArgumentException("pattern is missing for [" + name + "] token filter of type 'pattern_replace'"); } this.pattern = Regex.compile(sPattern, settings.get("flags")); this.replacement = settings.get("replacement", ""); diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java index d6e35eab5ecfc..f81eca7c4a1bc 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.PatternTokenizer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.regex.Regex; @@ -29,7 +29,6 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; -import java.io.Reader; import java.util.regex.Pattern; public class PatternTokenizerFactory extends AbstractTokenizerFactory { @@ -43,7 +42,7 @@ public PatternTokenizerFactory(Index index, @IndexSettings Settings indexSetting String sPattern = settings.get("pattern", "\\W+" /*PatternAnalyzer.NON_WORD_PATTERN*/); if (sPattern == null) { - throw new ElasticsearchIllegalArgumentException("pattern is missing for [" + name + "] tokenizer of type 'pattern'"); + throw new IllegalArgumentException("pattern is missing for [" + name + "] tokenizer of type 'pattern'"); } this.pattern = Regex.compile(sPattern, settings.get("flags")); diff --git a/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java index 655752f28a954..8d871f0c0a8df 100644 --- a/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -45,7 +45,7 @@ public StemmerOverrideTokenFilterFactory(Index index, @IndexSettings Settings in List rules = Analysis.getWordList(env, settings, "rules"); if (rules == null) { - throw new ElasticsearchIllegalArgumentException("stemmer override filter requires either `rules` or `rules_path` to be configured"); + throw new IllegalArgumentException("stemmer override filter requires either `rules` or `rules_path` to be configured"); } StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(false); diff --git a/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java index 745044d0019f6..07fda901e1d51 100644 --- a/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.search.suggest.analyzing.SuggestStopFilter; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -56,7 +56,7 @@ public StopTokenFilterFactory(Index index, @IndexSettings Settings indexSettings this.removeTrailing = settings.getAsBoolean("remove_trailing", true); this.stopWords = Analysis.parseStopWords(env, settings, StopAnalyzer.ENGLISH_STOP_WORDS_SET, ignoreCase); if (version.onOrAfter(Version.LUCENE_4_4) && settings.get("enable_position_increments") != null) { - throw new ElasticsearchIllegalArgumentException("enable_position_increments is not supported anymore as of Lucene 4.4 as it can create broken token streams." + throw new IllegalArgumentException("enable_position_increments is not supported anymore as of Lucene 4.4 as it can create broken token streams." + " Please fix your analysis chain or use an older compatibility version (<= 4.3)."); } this.enablePositionIncrements = settings.getAsBoolean("enable_position_increments", true); diff --git a/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java index 87ee3e9adf2f0..5ef4de1ea45f1 100644 --- a/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java @@ -28,11 +28,10 @@ import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; import org.apache.lucene.analysis.synonym.WordnetSynonymParser; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.io.FastStringReader; -import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; @@ -66,7 +65,7 @@ public SynonymTokenFilterFactory(Index index, @IndexSettings Settings indexSetti } else if (settings.get("synonyms_path") != null) { rulesReader = Analysis.getReaderFromFile(env, settings, "synonyms_path"); } else { - throw new ElasticsearchIllegalArgumentException("synonym requires either `synonyms` or `synonyms_path` to be configured"); + throw new IllegalArgumentException("synonym requires either `synonyms` or `synonyms_path` to be configured"); } this.ignoreCase = settings.getAsBoolean("ignore_case", false); @@ -79,7 +78,7 @@ public SynonymTokenFilterFactory(Index index, @IndexSettings Settings indexSetti tokenizerFactoryFactory = indicesAnalysisService.tokenizerFactoryFactory(tokenizerName); } if (tokenizerFactoryFactory == null) { - throw new ElasticsearchIllegalArgumentException("failed to find tokenizer [" + tokenizerName + "] for synonym token filter"); + throw new IllegalArgumentException("failed to find tokenizer [" + tokenizerName + "] for synonym token filter"); } final TokenizerFactory tokenizerFactory = tokenizerFactoryFactory.create(tokenizerName, ImmutableSettings.builder().put(indexSettings).put(settings).build()); @@ -106,7 +105,7 @@ protected TokenStreamComponents createComponents(String fieldName) { synonymMap = parser.build(); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to build synonyms", e); + throw new IllegalArgumentException("failed to build synonyms", e); } } diff --git a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java index a3d0d4b0fb5d2..0a9972b357789 100644 --- a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.miscellaneous.Lucene43TrimFilter; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TrimFilter; @@ -44,7 +44,7 @@ public class TrimTokenFilterFactory extends AbstractTokenFilterFactory { public TrimTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) { super(index, indexSettings, name, settings); if (version.onOrAfter(Version.LUCENE_4_4_0) && settings.get(UPDATE_OFFSETS_KEY) != null) { - throw new ElasticsearchIllegalArgumentException(UPDATE_OFFSETS_KEY + " is not supported anymore. Please fix your analysis chain or use" + throw new IllegalArgumentException(UPDATE_OFFSETS_KEY + " is not supported anymore. Please fix your analysis chain or use" + " an older compatibility version (<=4.3) but beware that it might cause highlighting bugs."); } this.updateOffsets = settings.getAsBoolean("update_offsets", false); diff --git a/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java index 69a37bc0a6bb8..56d43acdfdb6a 100644 --- a/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TruncateTokenFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -42,7 +42,7 @@ public TruncateTokenFilterFactory(Index index, @IndexSettings Settings indexSett super(index, indexSettings, name, settings); this.length = settings.getAsInt("length", -1); if (length <= 0) { - throw new ElasticsearchIllegalArgumentException("length parameter must be provided"); + throw new IllegalArgumentException("length parameter must be provided"); } } diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java index 0d5ceb77a9971..4f1513c9fb78f 100644 --- a/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase; import org.apache.lucene.analysis.util.CharArraySet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -52,7 +52,7 @@ public AbstractCompoundWordTokenFilterFactory(Index index, @IndexSettings Settin onlyLongestMatch = settings.getAsBoolean("only_longest_match", false); wordList = Analysis.getWordSet(env, settings, "word_list"); if (wordList == null) { - throw new ElasticsearchIllegalArgumentException("word_list must be provided for [" + name + "], either as a path to a file, or directly"); + throw new IllegalArgumentException("word_list must be provided for [" + name + "], either as a path to a file, or directly"); } } } \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java index acea0c2abc8b4..394e97b70258d 100644 --- a/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -36,8 +36,6 @@ import org.xml.sax.InputSource; import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; /** * Uses the {@link org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter} to decompound tokens based on hyphenation rules. @@ -55,7 +53,7 @@ public HyphenationCompoundWordTokenFilterFactory(Index index, @IndexSettings Set String hyphenationPatternsPath = settings.get("hyphenation_patterns_path", null); if (hyphenationPatternsPath == null) { - throw new ElasticsearchIllegalArgumentException("hyphenation_patterns_path is a required setting."); + throw new IllegalArgumentException("hyphenation_patterns_path is a required setting."); } URL hyphenationPatternsFile = env.resolveConfig(hyphenationPatternsPath); @@ -63,7 +61,7 @@ public HyphenationCompoundWordTokenFilterFactory(Index index, @IndexSettings Set try { hyphenationTree = HyphenationCompoundWordTokenFilter.getHyphenationTree(new InputSource(hyphenationPatternsFile.toExternalForm())); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("Exception while reading hyphenation_patterns_path: " + e.getMessage()); + throw new IllegalArgumentException("Exception while reading hyphenation_patterns_path: " + e.getMessage()); } } diff --git a/src/main/java/org/elasticsearch/index/codec/CodecService.java b/src/main/java/org/elasticsearch/index/codec/CodecService.java index cd1940eb8da32..783f304346fed 100644 --- a/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -24,7 +24,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ImmutableSettings; @@ -86,10 +86,10 @@ public MapperService mapperService() { return mapperService; } - public Codec codec(String name) throws ElasticsearchIllegalArgumentException { + public Codec codec(String name) throws IllegalArgumentException { Codec codec = codecs.get(name); if (codec == null) { - throw new ElasticsearchIllegalArgumentException("failed to find codec [" + name + "]"); + throw new IllegalArgumentException("failed to find codec [" + name + "]"); } return codec; } diff --git a/src/main/java/org/elasticsearch/index/engine/Engine.java b/src/main/java/org/elasticsearch/index/engine/Engine.java index 01398aa74eee0..3409138a4d852 100644 --- a/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -28,7 +28,7 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Accountables; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Preconditions; @@ -105,7 +105,7 @@ protected static long guardedRamBytesUsed(Accountable a) { /** * Tries to extract a segment reader from the given index reader. - * If no SegmentReader can be extracted an {@link org.elasticsearch.ElasticsearchIllegalStateException} is thrown. + * If no SegmentReader can be extracted an {@link IllegalStateException} is thrown. */ protected static SegmentReader segmentReader(LeafReader reader) { if (reader instanceof SegmentReader) { @@ -115,7 +115,7 @@ protected static SegmentReader segmentReader(LeafReader reader) { return segmentReader(FilterLeafReader.unwrap(fReader)); } // hard fail - we can't get a SegmentReader - throw new ElasticsearchIllegalStateException("Can not extract segment reader from given index reader [" + reader + "]"); + throw new IllegalStateException("Can not extract segment reader from given index reader [" + reader + "]"); } /** diff --git a/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java b/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java index 53bff1d8ef6ce..d43a8268de30c 100644 --- a/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java +++ b/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java @@ -23,9 +23,8 @@ import org.apache.lucene.search.SearcherManager; import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.store.Store; import java.io.IOException; @@ -54,13 +53,13 @@ public void close() throws ElasticsearchException { * when it might happen though: when the request and the Reaper thread would both try to release it in a very short amount * of time, this is why we only log a warning instead of throwing an exception. */ - logger.warn("Searcher was released twice", new ElasticsearchIllegalStateException("Double release")); + logger.warn("Searcher was released twice", new IllegalStateException("Double release")); return; } try { manager.release(this.searcher()); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot close", e); + throw new IllegalStateException("Cannot close", e); } catch (AlreadyClosedException e) { /* this one can happen if we already closed the * underlying store / directory and we call into the diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java index 35c578ac4a7d4..63885c4c539cd 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java +++ b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.collect.Tuple; @@ -230,7 +230,7 @@ public > IFD getForField(FieldMapper mapper) { final FieldMapper.Names fieldNames = mapper.names(); final FieldDataType type = mapper.fieldDataType(); if (type == null) { - throw new ElasticsearchIllegalArgumentException("found no fielddata type for field [" + fieldNames.fullName() + "]"); + throw new IllegalArgumentException("found no fielddata type for field [" + fieldNames.fullName() + "]"); } final boolean docValues = mapper.hasDocValues(); final String key = fieldNames.indexName(); @@ -259,7 +259,7 @@ public > IFD getForField(FieldMapper mapper) { builder = buildersByType.get(type.getType()); } if (builder == null) { - throw new ElasticsearchIllegalArgumentException("failed to find field data builder for field " + fieldNames.fullName() + ", and type " + type.getType()); + throw new IllegalArgumentException("failed to find field data builder for field " + fieldNames.fullName() + ", and type " + type.getType()); } IndexFieldDataCache cache = fieldDataCaches.get(fieldNames.indexName()); @@ -272,7 +272,7 @@ public > IFD getForField(FieldMapper mapper) { } else if ("none".equals(cacheType)){ cache = new IndexFieldDataCache.None(); } else { - throw new ElasticsearchIllegalArgumentException("cache type not supported [" + cacheType + "] for field [" + fieldNames.fullName() + "]"); + throw new IllegalArgumentException("cache type not supported [" + cacheType + "] for field [" + fieldNames.fullName() + "]"); } fieldDataCaches.put(fieldNames.indexName(), cache); } diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java index cd20656fa51f6..fb0a1ab438587 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java @@ -24,7 +24,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder; import org.elasticsearch.index.mapper.core.BooleanFieldMapper; @@ -41,7 +41,7 @@ public long toLong(BytesRef indexForm) { } else if (indexForm.equals(BooleanFieldMapper.Values.TRUE)) { return 1; } else { - throw new ElasticsearchIllegalArgumentException("Cannot convert " + indexForm + " to a boolean"); + throw new IllegalArgumentException("Cannot convert " + indexForm + " to a boolean"); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java index 09eaf5594223d..1c955efef3522 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; @@ -78,7 +78,7 @@ public AbstractIndexGeoPointFieldData(Index index, Settings indexSettings, Names @Override public final XFieldComparatorSource comparatorSource(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested) { - throw new ElasticsearchIllegalArgumentException("can't sort on geo_point field without using specific sorting feature, like geo_distance"); + throw new IllegalArgumentException("can't sort on geo_point field without using specific sorting feature, like geo_distance"); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java index 7b74cca09492f..80f03b90fe7f1 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.index.fielddata.AtomicFieldData; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.ScriptDocValues; @@ -53,7 +53,7 @@ public SortedBinaryDocValues getBytesValues() { final Bits docsWithField = DocValues.getDocsWithField(reader, field); return FieldData.singleton(values, docsWithField); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java index 5196644672c03..40bc77aaefb95 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java @@ -29,8 +29,8 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.util.ByteUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.AtomicNumericFieldData; @@ -86,7 +86,7 @@ public SortedNumericDoubleValues getDoubleValues() { case DOUBLE: return new BinaryAsSortedNumericDoubleValues(values); default: - throw new ElasticsearchIllegalArgumentException("" + numericType); + throw new IllegalArgumentException("" + numericType); } } @@ -112,7 +112,7 @@ public Collection getChildResources() { }; } } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java index b2def2199182c..6cc9adbfdf2cf 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java @@ -21,8 +21,8 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; @@ -46,7 +46,7 @@ public BytesBinaryDVIndexFieldData(Index index, Names fieldNames, FieldDataType @Override public final XFieldComparatorSource comparatorSource(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested) { - throw new ElasticsearchIllegalArgumentException("can't sort on binary field"); + throw new IllegalArgumentException("can't sort on binary field"); } @Override @@ -54,7 +54,7 @@ public BytesBinaryDVAtomicFieldData load(LeafReaderContext context) { try { return new BytesBinaryDVAtomicFieldData(DocValues.getBinary(context.reader(), fieldNames.indexName())); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java index 05282910d97ea..4690a3529b698 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.fielddata.plain; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.*; @@ -33,7 +33,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; /** - * A field data implementation that forbids loading and will throw an {@link org.elasticsearch.ElasticsearchIllegalStateException} if you try to load + * A field data implementation that forbids loading and will throw an {@link IllegalStateException} if you try to load * {@link AtomicFieldData} instances. */ public final class DisabledIndexFieldData extends AbstractIndexFieldData { @@ -61,8 +61,8 @@ public IndexFieldData.XFieldComparatorSource comparatorSource(Object missingValu throw fail(); } - private ElasticsearchIllegalStateException fail() { - return new ElasticsearchIllegalStateException("Field data loading is forbidden on " + getFieldNames().name()); + private IllegalStateException fail() { + return new IllegalStateException("Field data loading is forbidden on " + getFieldNames().name()); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java index 16dc0eb6267ea..a211787039d6c 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableSet; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -98,7 +98,7 @@ public IndexFieldData build(Index index, Settings indexSettings, FieldMapper< final Settings fdSettings = mapper.fieldDataType().getSettings(); final Map filter = fdSettings.getGroups("filter"); if (filter != null && !filter.isEmpty()) { - throw new ElasticsearchIllegalArgumentException("Doc values field data doesn't support filters [" + fieldNames.name() + "]"); + throw new IllegalArgumentException("Doc values field data doesn't support filters [" + fieldNames.name() + "]"); } if (BINARY_INDEX_FIELD_NAMES.contains(fieldNames.indexName())) { diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java index d308f98e3f961..62a70b101d0dd 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java @@ -21,8 +21,8 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; @@ -44,7 +44,7 @@ public GeoPointBinaryDVIndexFieldData(Index index, Names fieldNames, FieldDataTy @Override public final XFieldComparatorSource comparatorSource(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested) { - throw new ElasticsearchIllegalArgumentException("can't sort on geo_point field without using specific sorting feature, like geo_distance"); + throw new IllegalArgumentException("can't sort on geo_point field without using specific sorting feature, like geo_distance"); } @Override @@ -52,7 +52,7 @@ public AtomicGeoPointFieldData load(LeafReaderContext context) { try { return new GeoPointBinaryDVAtomicFieldData(DocValues.getBinary(context.reader(), fieldNames.indexName())); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java index 3aad56e27cdfb..5c400fb0d7329 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; @@ -57,7 +57,7 @@ public SortedNumericDocValues getLongValues() { final Bits docsWithField = DocValues.getDocsWithField(reader, field); return DocValues.singleton(values, docsWithField); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java index 98cc061f05aa8..7a4201d45cf32 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java @@ -39,7 +39,7 @@ import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.collect.ImmutableOpenMap; @@ -505,7 +505,7 @@ public IndexParentChildFieldData loadGlobal(IndexReader indexReader) { if (indexReader.getCoreCacheKey() == reader.getCoreCacheKey()) { return this; } - throw new ElasticsearchIllegalStateException(); + throw new IllegalStateException(); } @Override diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java index 1328442a399f1..07ec2b7740398 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java @@ -29,7 +29,7 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.AtomicNumericFieldData; import org.elasticsearch.index.fielddata.FieldData; @@ -127,7 +127,7 @@ public SortedNumericDocValues getLongValues() { try { return DocValues.getSortedNumeric(reader, field); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } @@ -176,7 +176,7 @@ public SortedNumericDoubleValues getDoubleValues() { return new MultiFloatValues(raw); } } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } @@ -261,7 +261,7 @@ public SortedNumericDoubleValues getDoubleValues() { SortedNumericDocValues raw = DocValues.getSortedNumeric(reader, field); return FieldData.sortableLongBitsToDoubles(raw); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Cannot load doc values", e); + throw new IllegalStateException("Cannot load doc values", e); } } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java index d5f68bde92d6a..e7aeb9d9c0fc3 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.RandomAccessOrds; import org.apache.lucene.util.Accountable; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.index.fielddata.AtomicFieldData; import org.elasticsearch.index.fielddata.FieldData; @@ -49,7 +49,7 @@ public RandomAccessOrds getOrdinalsValues() { try { return FieldData.maybeSlowRandomAccessOrds(DocValues.getSortedSet(reader, field)); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("cannot load docvalues", e); + throw new IllegalStateException("cannot load docvalues", e); } } diff --git a/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/src/main/java/org/elasticsearch/index/get/ShardGetService.java index a52962b1b7998..23da1c3568278 100644 --- a/src/main/java/org/elasticsearch/index/get/ShardGetService.java +++ b/src/main/java/org/elasticsearch/index/get/ShardGetService.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.Term; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; @@ -247,7 +247,7 @@ public GetResult innerGet(String type, String id, String[] gFields, boolean real if (fieldMapper == null) { if (docMapper.objectMappers().get(field) != null) { // Only fail if we know it is a object field, missing paths / fields shouldn't fail. - throw new ElasticsearchIllegalArgumentException("field [" + field + "] isn't a leaf field"); + throw new IllegalArgumentException("field [" + field + "] isn't a leaf field"); } } else if (shouldGetFromSource(ignoreErrorsOnGeneratedFields, docMapper, fieldMapper)) { List values = searchLookup.source().extractRawValues(field); @@ -367,7 +367,7 @@ private GetResult innerGetLoadFromStoredFields(String type, String id, String[] if (fieldMapper == null) { if (docMapper.objectMappers().get(field) != null) { // Only fail if we know it is a object field, missing paths / fields shouldn't fail. - throw new ElasticsearchIllegalArgumentException("field [" + field + "] isn't a leaf field"); + throw new IllegalArgumentException("field [" + field + "] isn't a leaf field"); } } else if (!fieldMapper.fieldType().stored() && !fieldMapper.isGenerated()) { if (searchLookup == null) { diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java index 51b8119e59c8d..5c9cea416ec2c 100644 --- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.BitDocIdSet; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.Strings; @@ -562,7 +562,7 @@ public Map transformSourceAsMap(Map sourceAsMap) ctx = (Map) executable.unwrap(ctx); return (Map) ctx.get("_source"); } catch (Exception e) { - throw new ElasticsearchIllegalArgumentException("failed to execute script", e); + throw new IllegalArgumentException("failed to execute script", e); } } diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index 2cd958fce7b62..9520bb117f145 100644 --- a/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.CloseableThreadLocal; -import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.joda.FormatDateTimeFormatter; @@ -576,7 +575,7 @@ private static ObjectMapper parseDynamicValue(final ParseContext context, Object mapper = builder.build(builderContext); } else { // TODO how do we identify dynamically that its a binary value? - throw new ElasticsearchIllegalStateException("Can't handle serializing a dynamic type with content token [" + token + "] and field name [" + currentFieldName + "]"); + throw new IllegalStateException("Can't handle serializing a dynamic type with content token [" + token + "] and field name [" + currentFieldName + "]"); } } @@ -652,7 +651,7 @@ private static void parseCopy(String field, ParseContext context) throws IOExcep parent = context.docMapper().objectMappers().get(parentPath); } if (parent == null) { - throw new ElasticsearchIllegalStateException("[" + objectPath + "] has no parent for path [" + parentPath + "]"); + throw new IllegalStateException("[" + objectPath + "] has no parent for path [" + parentPath + "]"); } update = parent.mappingUpdate(update); objectPath = parentPath; diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java index 236083f1e7713..b820aad9820e7 100755 --- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -39,7 +39,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.Tuple; @@ -717,7 +717,7 @@ public FieldMapper unmappedFieldMapper(String type) { final Mapper.TypeParser.ParserContext parserContext = documentMapperParser().parserContext(); Mapper.TypeParser typeParser = parserContext.typeParser(type); if (typeParser == null) { - throw new ElasticsearchIllegalArgumentException("No mapper found for type [" + type + "]"); + throw new IllegalArgumentException("No mapper found for type [" + type + "]"); } final Mapper.Builder builder = typeParser.parse("__anonymous_" + type, ImmutableMap.of(), parserContext); final BuilderContext builderContext = new BuilderContext(indexSettings, new ContentPath(1)); diff --git a/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/src/main/java/org/elasticsearch/index/mapper/ParseContext.java index 6530af5e0c61d..3ddb3276b2419 100644 --- a/src/main/java/org/elasticsearch/index/mapper/ParseContext.java +++ b/src/main/java/org/elasticsearch/index/mapper/ParseContext.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.lucene.all.AllEntries; @@ -110,7 +110,7 @@ public void addWithKey(Object key, IndexableField field) { if (keyedFields == null) { keyedFields = new ObjectObjectOpenHashMap<>(); } else if (keyedFields.containsKey(key)) { - throw new ElasticsearchIllegalStateException("Only one field can be stored per key"); + throw new IllegalStateException("Only one field can be stored per key"); } keyedFields.put(key, field); add(field); @@ -790,7 +790,7 @@ public boolean externalValueSet() { } public Object externalValue() { - throw new ElasticsearchIllegalStateException("External value is not set"); + throw new IllegalStateException("External value is not set"); } /** @@ -804,7 +804,7 @@ public final T parseExternalValue(Class clazz) { } if (!clazz.isInstance(externalValue())) { - throw new ElasticsearchIllegalArgumentException("illegal external value class [" + throw new IllegalArgumentException("illegal external value class [" + externalValue().getClass().getName() + "]. Should be " + clazz.getName()); } return clazz.cast(externalValue()); diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java index 40dc4a7731356..7e97c86b4b698 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java @@ -40,8 +40,6 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.index.Terms; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Nullable; @@ -767,7 +765,7 @@ protected static String indexOptionToString(IndexOptions indexOption) { case DOCS: return TypeParsers.INDEX_OPTIONS_DOCS; default: - throw new ElasticsearchIllegalArgumentException("Unknown IndexOptions [" + indexOption + "]"); + throw new IllegalArgumentException("Unknown IndexOptions [" + indexOption + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java index d3c5eae809fc3..ae914de0597fa 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -94,7 +94,7 @@ public Builder nullValue(boolean nullValue) { @Override public Builder tokenized(boolean tokenized) { if (tokenized) { - throw new ElasticsearchIllegalArgumentException("bool field can't be tokenized"); + throw new IllegalArgumentException("bool field can't be tokenized"); } return super.tokenized(tokenized); } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java index 5c54934ad5bfb..64b9bbde98586 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java @@ -30,7 +30,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -296,7 +296,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java index baba0f42f8761..0d6e4f4bee3e0 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java @@ -28,8 +28,8 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.search.suggest.analyzing.XAnalyzingSuggester; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; @@ -137,7 +137,7 @@ public Builder preservePositionIncrements(boolean preservePositionIncrements) { public Builder maxInputLength(int maxInputLength) { if (maxInputLength <= 0) { - throw new ElasticsearchIllegalArgumentException(Fields.MAX_INPUT_LENGTH.getPreferredName() + " must be > 0 but was [" + maxInputLength + "]"); + throw new IllegalArgumentException(Fields.MAX_INPUT_LENGTH.getPreferredName() + " must be > 0 but was [" + maxInputLength + "]"); } this.maxInputLength = maxInputLength; return this; @@ -215,7 +215,7 @@ public static class TypeParser implements Mapper.TypeParser { private NamedAnalyzer getNamedAnalyzer(ParserContext parserContext, String name) { NamedAnalyzer analyzer = parserContext.analysisService().analyzer(name); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("Can't find default or mapped analyzer with name [" + name + "]"); + throw new IllegalArgumentException("Can't find default or mapped analyzer with name [" + name + "]"); } return analyzer; } @@ -257,7 +257,7 @@ public CompletionFieldMapper(Names names, NamedAnalyzer indexAnalyzer, NamedAnal public synchronized PostingsFormat postingsFormat(PostingsFormat in) { if (in instanceof Completion090PostingsFormat) { - throw new ElasticsearchIllegalStateException("Double wrapping of " + Completion090PostingsFormat.class); + throw new IllegalStateException("Double wrapping of " + Completion090PostingsFormat.class); } if (postingsFormat == null) { postingsFormat = new Completion090PostingsFormat(in, analyzingSuggestLookupProvider); @@ -286,7 +286,7 @@ public Mapper parse(ParseContext context) throws IOException { if (token == XContentParser.Token.FIELD_NAME) { currentFieldName = parser.currentName(); if (!ALLOWED_CONTENT_FIELD_NAMES.contains(currentFieldName)) { - throw new ElasticsearchIllegalArgumentException("Unknown field name[" + currentFieldName + "], must be one of " + ALLOWED_CONTENT_FIELD_NAMES); + throw new IllegalArgumentException("Unknown field name[" + currentFieldName + "], must be one of " + ALLOWED_CONTENT_FIELD_NAMES); } } else if (Fields.CONTEXT.equals(currentFieldName)) { SortedMap configs = Maps.newTreeMap(); @@ -335,7 +335,7 @@ public Mapper parse(ParseContext context) throws IOException { try { weightValue = Long.parseLong(parser.text()); } catch (NumberFormatException e) { - throw new ElasticsearchIllegalArgumentException("Weight must be a string representing a numeric value, but was [" + parser.text() + "]"); + throw new IllegalArgumentException("Weight must be a string representing a numeric value, but was [" + parser.text() + "]"); } weight = weightValue.longValue(); // always parse a long to make sure we don't get overflow checkWeight(weight); @@ -344,7 +344,7 @@ public Mapper parse(ParseContext context) throws IOException { if (Fields.CONTENT_FIELD_NAME_WEIGHT.equals(currentFieldName)) { NumberType numberType = parser.numberType(); if (NumberType.LONG != numberType && NumberType.INT != numberType) { - throw new ElasticsearchIllegalArgumentException("Weight must be an integer, but was [" + parser.numberValue() + "]"); + throw new IllegalArgumentException("Weight must be an integer, but was [" + parser.numberValue() + "]"); } weight = parser.longValue(); // always parse a long to make sure we don't get overflow checkWeight(weight); @@ -387,7 +387,7 @@ public Mapper parse(ParseContext context) throws IOException { private void checkWeight(long weight) { if (weight < 0 || weight > Integer.MAX_VALUE) { - throw new ElasticsearchIllegalArgumentException("Weight must be in the interval [0..2147483647], but was [" + weight + "]"); + throw new IllegalArgumentException("Weight must be in the interval [0..2147483647], but was [" + weight + "]"); } } @@ -415,7 +415,7 @@ public Field getCompletionField(ContextMapping.Context ctx, String input, BytesR } for (int i = 0; i < input.length(); i++) { if (isReservedChar(input.charAt(i))) { - throw new ElasticsearchIllegalArgumentException("Illegal input [" + originalInput + "] UTF-16 codepoint [0x" + throw new IllegalArgumentException("Illegal input [" + originalInput + "] UTF-16 codepoint [0x" + Integer.toHexString((int) input.charAt(i)).toUpperCase(Locale.ROOT) + "] at position " + i + " is a reserved character"); } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java index b10c4aff1da55..75c1e8ac483d7 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.ToStringUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -458,7 +458,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java index 7381855fb1a25..490455431e8d3 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -290,7 +290,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java index b87da803a7e91..d1259d245984b 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -296,7 +296,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java index c6ebc8ed640b3..05015e2579364 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -290,7 +290,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java index e08f84c2192aa..afaefb4a31e55 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -280,7 +280,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java index 280f139d459be..edb3a12291a7a 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java @@ -39,7 +39,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -238,7 +238,7 @@ protected void parseCreateField(ParseContext context, List fields) throws RuntimeException e = null; try { innerParseCreateField(context, fields); - } catch (IllegalArgumentException | ElasticsearchIllegalArgumentException e1) { + } catch (IllegalArgumentException e1) { e = e1; } catch (MapperParsingException e2) { e = e2; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java index 9d0b960c04062..9947890619550 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; @@ -296,7 +296,7 @@ protected void innerParseCreateField(ParseContext context, List fields) t } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java index fdd994fa67176..3d9d871f3a82a 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Filter; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; @@ -339,7 +339,7 @@ public static ValueAndBoost parseCreateFieldForString(ParseContext context, Stri } else if ("boost".equals(currentFieldName) || "_boost".equals(currentFieldName)) { boost = parser.floatValue(); } else { - throw new ElasticsearchIllegalArgumentException("unknown property [" + currentFieldName + "]"); + throw new IllegalArgumentException("unknown property [" + currentFieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java index a17941802b412..634b3c5d94367 100644 --- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -301,7 +301,7 @@ public static final class Encoding { public static final Encoding of(int numBytesPerValue) { final Encoding instance = INSTANCES[numBytesPerValue]; if (instance == null) { - throw new ElasticsearchIllegalStateException("No encoding for " + numBytesPerValue + " bytes per value"); + throw new IllegalStateException("No encoding for " + numBytesPerValue + " bytes per value"); } return instance; } @@ -593,12 +593,12 @@ private void parse(ParseContext context, GeoPoint point, String geohash) throws if (validateLat) { if (point.lat() > 90.0 || point.lat() < -90.0) { - throw new ElasticsearchIllegalArgumentException("illegal latitude value [" + point.lat() + "] for " + name()); + throw new IllegalArgumentException("illegal latitude value [" + point.lat() + "] for " + name()); } } if (validateLon) { if (point.lon() > 180.0 || point.lon() < -180) { - throw new ElasticsearchIllegalArgumentException("illegal longitude value [" + point.lon() + "] for " + name()); + throw new IllegalArgumentException("illegal longitude value [" + point.lon() + "] for " + name()); } } diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java index d54cb4e2e6bdc..b34d4fea36d68 100644 --- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java @@ -29,7 +29,7 @@ import org.apache.lucene.spatial.prefix.tree.PackedQuadPrefixTree; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.geo.GeoUtils; @@ -168,7 +168,7 @@ public GeoShapeFieldMapper build(BuilderContext context) { .QUADTREE_LEVELS, false)); } } else { - throw new ElasticsearchIllegalArgumentException("Unknown prefix tree type [" + tree + "]"); + throw new IllegalArgumentException("Unknown prefix tree type [" + tree + "]"); } return new GeoShapeFieldMapper(names, prefixTree, strategyName, distanceErrorPct, orientation, fieldType, @@ -384,7 +384,7 @@ public PrefixTreeStrategy resolveStrategy(String strategyName) { if (SpatialStrategy.TERM.getStrategyName().equals(strategyName)) { return termStrategy; } - throw new ElasticsearchIllegalArgumentException("Unknown prefix tree strategy [" + strategyName + "]"); + throw new IllegalArgumentException("Unknown prefix tree strategy [" + strategyName + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java index 46cef4cfeb5b4..565f1dcc00b52 100644 --- a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -110,7 +110,7 @@ public static class TypeParser implements Mapper.TypeParser { @Override public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { if (parserContext.indexVersionCreated().before(Version.V_1_3_0)) { - throw new ElasticsearchIllegalArgumentException("type="+CONTENT_TYPE+" is not supported on indices created before version 1.3.0. Is your cluster running multiple datanode versions?"); + throw new IllegalArgumentException("type="+CONTENT_TYPE+" is not supported on indices created before version 1.3.0. Is your cluster running multiple datanode versions?"); } FieldNamesFieldMapper.Builder builder = fieldNames(); diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java index 61188cd4bbff0..1abf2d38c6667 100644 --- a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Numbers; @@ -83,22 +83,22 @@ public static String longToIp(long longIp) { private static final Pattern pattern = Pattern.compile("\\."); - public static long ipToLong(String ip) throws ElasticsearchIllegalArgumentException { + public static long ipToLong(String ip) throws IllegalArgumentException { try { if (!InetAddresses.isInetAddress(ip)) { - throw new ElasticsearchIllegalArgumentException("failed to parse ip [" + ip + "], not a valid ip address"); + throw new IllegalArgumentException("failed to parse ip [" + ip + "], not a valid ip address"); } String[] octets = pattern.split(ip); if (octets.length != 4) { - throw new ElasticsearchIllegalArgumentException("failed to parse ip [" + ip + "], not a valid ipv4 address (4 dots)"); + throw new IllegalArgumentException("failed to parse ip [" + ip + "], not a valid ipv4 address (4 dots)"); } return (Long.parseLong(octets[0]) << 24) + (Integer.parseInt(octets[1]) << 16) + (Integer.parseInt(octets[2]) << 8) + Integer.parseInt(octets[3]); } catch (Exception e) { - if (e instanceof ElasticsearchIllegalArgumentException) { - throw (ElasticsearchIllegalArgumentException) e; + if (e instanceof IllegalArgumentException) { + throw (IllegalArgumentException) e; } - throw new ElasticsearchIllegalArgumentException("failed to parse ip [" + ip + "]", e); + throw new IllegalArgumentException("failed to parse ip [" + ip + "]", e); } } @@ -235,7 +235,7 @@ public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int long iSim; try { iSim = ipToLong(fuzziness.asString()); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { iSim = fuzziness.asLong(); } return NumericRangeQuery.newLongRange(names.indexName(), precisionStep, diff --git a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java index 08888e9aea2d0..2edd773a81c42 100644 --- a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java +++ b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.mapper.object; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.index.mapper.ContentPath; @@ -46,7 +46,7 @@ public static MatchType fromString(String value) { } else if ("regex".equals(value)) { return REGEX; } - throw new ElasticsearchIllegalArgumentException("No matching pattern matched on [" + value + "]"); + throw new IllegalArgumentException("No matching pattern matched on [" + value + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java index 67c3636be7dbe..9d591156b99ad 100644 --- a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java @@ -241,7 +241,7 @@ protected static boolean parseObjectProperties(String name, String fieldName, Ob builder.pathType(parsePathType(name, fieldNode.toString())); return true; } - return false; + return false; } protected static void parseNested(String name, Map node, ObjectMapper.Builder builder) { diff --git a/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java index c3aa5e16606fa..6ea8d71c4f203 100644 --- a/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java @@ -20,7 +20,7 @@ import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.TieredMergePolicy; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.store.Store; @@ -46,11 +46,11 @@ public static double parseNoCFSRatio(String noCFSRatio) { try { double value = Double.parseDouble(noCFSRatio); if (value < 0.0 || value > 1.0) { - throw new ElasticsearchIllegalArgumentException("NoCFSRatio must be in the interval [0..1] but was: [" + value + "]"); + throw new IllegalArgumentException("NoCFSRatio must be in the interval [0..1] but was: [" + value + "]"); } return value; } catch (NumberFormatException ex) { - throw new ElasticsearchIllegalArgumentException("Expected a boolean or a value in the interval [0..1] but was: [" + noCFSRatio + "]", ex); + throw new IllegalArgumentException("Expected a boolean or a value in the interval [0..1] but was: [" + noCFSRatio + "]", ex); } } } diff --git a/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java index aaf369155776d..57f444e4eabe6 100644 --- a/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -74,13 +74,13 @@ public BoostingQueryBuilder boost(float boost) { @Override protected void doXContent(XContentBuilder builder, Params params) throws IOException { if (positiveQuery == null) { - throw new ElasticsearchIllegalArgumentException("boosting query requires positive query to be set"); + throw new IllegalArgumentException("boosting query requires positive query to be set"); } if (negativeQuery == null) { - throw new ElasticsearchIllegalArgumentException("boosting query requires negative query to be set"); + throw new IllegalArgumentException("boosting query requires negative query to be set"); } if (negativeBoost == -1) { - throw new ElasticsearchIllegalArgumentException("boosting query requires negativeBoost to be set"); + throw new IllegalArgumentException("boosting query requires negativeBoost to be set"); } builder.startObject(BoostingQueryParser.NAME); builder.field("positive"); diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java index 16cb0bf7e57ec..62b73012fb691 100644 --- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -73,10 +73,10 @@ public static enum Operator { */ public CommonTermsQueryBuilder(String name, Object text) { if (name == null) { - throw new ElasticsearchIllegalArgumentException("Field name must not be null"); + throw new IllegalArgumentException("Field name must not be null"); } if (text == null) { - throw new ElasticsearchIllegalArgumentException("Query must not be null"); + throw new IllegalArgumentException("Query must not be null"); } this.text = text; this.name = name; diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java index 46997ffb7fd3d..eb2038e8a55bc 100644 --- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRefBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.FieldMapper; @@ -187,7 +187,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars } else { analyzer = parseContext.mapperService().analysisService().analyzer(queryAnalyzer); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("No analyzer found for [" + queryAnalyzer + "]"); + throw new IllegalArgumentException("No analyzer found for [" + queryAnalyzer + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java index c2133f10d7760..3083056cc420f 100644 --- a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -167,13 +167,13 @@ public GeoBoundingBoxFilterBuilder type(String type) { protected void doXContent(XContentBuilder builder, Params params) throws IOException { // check values if(Double.isNaN(box[TOP])) { - throw new ElasticsearchIllegalArgumentException("geo_bounding_box requires top latitude to be set"); + throw new IllegalArgumentException("geo_bounding_box requires top latitude to be set"); } else if(Double.isNaN(box[BOTTOM])) { - throw new ElasticsearchIllegalArgumentException("geo_bounding_box requires bottom latitude to be set"); + throw new IllegalArgumentException("geo_bounding_box requires bottom latitude to be set"); } else if(Double.isNaN(box[RIGHT])) { - throw new ElasticsearchIllegalArgumentException("geo_bounding_box requires right longitude to be set"); + throw new IllegalArgumentException("geo_bounding_box requires right longitude to be set"); } else if(Double.isNaN(box[LEFT])) { - throw new ElasticsearchIllegalArgumentException("geo_bounding_box requires left longitude to be set"); + throw new IllegalArgumentException("geo_bounding_box requires left longitude to be set"); } builder.startObject(GeoBoundingBoxFilterParser.NAME); diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java index ac732bc99aad7..b26eaee2848a6 100644 --- a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java @@ -28,7 +28,7 @@ import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; import org.apache.lucene.spatial.query.SpatialArgs; import org.apache.lucene.spatial.query.SpatialOperation; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.geo.ShapeRelation; @@ -191,7 +191,7 @@ public static SpatialArgs getArgs(ShapeBuilder shape, ShapeRelation relation) { case WITHIN: return new SpatialArgs(SpatialOperation.IsWithin, shape.build()); default: - throw new ElasticsearchIllegalArgumentException(""); + throw new IllegalArgumentException(""); } } diff --git a/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java b/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java index 9e69bc25a89ab..18d6ffead1c7e 100644 --- a/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java +++ b/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.QueryCachingPolicy; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -78,7 +78,7 @@ public class GeohashCellFilter { */ public static Filter create(QueryParseContext context, GeoPointFieldMapper fieldMapper, String geohash, @Nullable List geohashes) { if (fieldMapper.geoHashStringMapper() == null) { - throw new ElasticsearchIllegalArgumentException("geohash filter needs geohash_prefix to be enabled"); + throw new IllegalArgumentException("geohash filter needs geohash_prefix to be enabled"); } StringFieldMapper geoHashMapper = fieldMapper.geoHashStringMapper(); diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java index ea814e6a15f5d..9c964d0bce52f 100644 --- a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.get.MultiGetRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; @@ -383,7 +383,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep builder.endArray(); } if (this.docs.isEmpty()) { - throw new ElasticsearchIllegalArgumentException("more_like_this requires '" + likeFieldName + "' to be provided"); + throw new IllegalArgumentException("more_like_this requires '" + likeFieldName + "' to be provided"); } else { builder.field(likeFieldName, docs); } diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java index 9ef53961a9e87..9325d0f72f81d 100644 --- a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest; @@ -173,14 +173,14 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars } else if (Fields.DOCUMENT_IDS.match(currentFieldName, parseContext.parseFlags())) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (!token.isValue()) { - throw new ElasticsearchIllegalArgumentException("ids array element should only contain ids"); + throw new IllegalArgumentException("ids array element should only contain ids"); } likeItems.add(newTermVectorsRequest().id(parser.text())); } } else if (Fields.DOCUMENTS.match(currentFieldName, parseContext.parseFlags())) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("docs array element should include an object"); + throw new IllegalArgumentException("docs array element should include an object"); } likeItems.add(parseDocument(parser)); } @@ -313,7 +313,7 @@ private void parseLikeField(XContentParser parser, List likeTexts, Multi } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) { items.add(parseDocument(parser)); } else { - throw new ElasticsearchIllegalArgumentException("Content of 'like' parameter should either be a string or an object"); + throw new IllegalArgumentException("Content of 'like' parameter should either be a string or an object"); } } @@ -331,7 +331,7 @@ private List removeUnsupportedFields(List moreLikeFields, Analyz final String fieldName = it.next(); if (!Analysis.generatesCharacterTokenStream(analyzer, fieldName)) { if (failOnUnsupportedField) { - throw new ElasticsearchIllegalArgumentException("more_like_this doesn't support binary/numeric fields: [" + fieldName + "]"); + throw new IllegalArgumentException("more_like_this doesn't support binary/numeric fields: [" + fieldName + "]"); } else { it.remove(); } diff --git a/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/src/main/java/org/elasticsearch/index/query/RegexpFlag.java index 454d0264b673e..68c024b032a64 100644 --- a/src/main/java/org/elasticsearch/index/query/RegexpFlag.java +++ b/src/main/java/org/elasticsearch/index/query/RegexpFlag.java @@ -21,7 +21,7 @@ import java.util.Locale; import org.apache.lucene.util.automaton.RegExp; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; /** @@ -128,7 +128,7 @@ static int resolveValue(String flags) { } magic |= flag.value(); } catch (IllegalArgumentException iae) { - throw new ElasticsearchIllegalArgumentException("Unknown regexp flag [" + s + "]"); + throw new IllegalArgumentException("Unknown regexp flag [" + s + "]"); } } return magic; diff --git a/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java b/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java index b52b6c7544ed7..e821fab8e0a0b 100644 --- a/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java +++ b/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.QueryCachingPolicy; import org.apache.lucene.util.Bits; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.lucene.HashedBytesRef; @@ -197,7 +197,7 @@ protected boolean matchDoc(int doc) { if (val instanceof Number) { return ((Number) val).longValue() != 0; } - throw new ElasticsearchIllegalArgumentException("Can't handle type [" + val + "] in script filter"); + throw new IllegalArgumentException("Can't handle type [" + val + "] in script filter"); } @Override diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java index 54c6291951d76..7fe973ab8c263 100644 --- a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java +++ b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import java.util.Locale; @@ -72,7 +72,7 @@ static int resolveFlags(String flags) { magic |= flag.value(); } } catch (IllegalArgumentException iae) { - throw new ElasticsearchIllegalArgumentException("Unknown " + SimpleQueryStringParser.NAME + " flag [" + s + "]"); + throw new IllegalArgumentException("Unknown " + SimpleQueryStringParser.NAME + " flag [" + s + "]"); } } return magic; diff --git a/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java index 286fab968ebd1..f99253f1bb6fe 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -79,10 +79,10 @@ public SpanNearQueryBuilder queryName(String queryName) { @Override protected void doXContent(XContentBuilder builder, Params params) throws IOException { if (clauses.isEmpty()) { - throw new ElasticsearchIllegalArgumentException("Must have at least one clause when building a spanNear query"); + throw new IllegalArgumentException("Must have at least one clause when building a spanNear query"); } if (slop == null) { - throw new ElasticsearchIllegalArgumentException("Must set the slop when building a spanNear query"); + throw new IllegalArgumentException("Must set the slop when building a spanNear query"); } builder.startObject(SpanNearQueryParser.NAME); builder.startArray("clauses"); diff --git a/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java index cb14dae11d2c7..bd69ac6dca14c 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -87,14 +87,14 @@ public SpanNotQueryBuilder queryName(String queryName) { @Override protected void doXContent(XContentBuilder builder, Params params) throws IOException { if (include == null) { - throw new ElasticsearchIllegalArgumentException("Must specify include when using spanNot query"); + throw new IllegalArgumentException("Must specify include when using spanNot query"); } if (exclude == null) { - throw new ElasticsearchIllegalArgumentException("Must specify exclude when using spanNot query"); + throw new IllegalArgumentException("Must specify exclude when using spanNot query"); } if (dist != null && (pre != null || post != null)) { - throw new ElasticsearchIllegalArgumentException("spanNot can either use [dist] or [pre] & [post] (or none)"); + throw new IllegalArgumentException("spanNot can either use [dist] or [pre] & [post] (or none)"); } builder.startObject(SpanNotQueryParser.NAME); diff --git a/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java index f780ed8b05dec..150a3ab6f607d 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -58,7 +58,7 @@ public SpanOrQueryBuilder queryName(String queryName) { @Override protected void doXContent(XContentBuilder builder, Params params) throws IOException { if (clauses.isEmpty()) { - throw new ElasticsearchIllegalArgumentException("Must have at least one clause when building a spanOr query"); + throw new IllegalArgumentException("Must have at least one clause when building a spanOr query"); } builder.startObject(SpanOrQueryParser.NAME); builder.startArray("clauses"); diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java index 176f97f4fff22..ce133743fb7c6 100644 --- a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.script.ScriptService; @@ -71,7 +71,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep fieldname = TemplateQueryParser.QUERY; break; default: - throw new ElasticsearchIllegalArgumentException("Unknown template type " + templateType); + throw new IllegalArgumentException("Unknown template type " + templateType); } builder.field(fieldname, template); builder.field(TemplateQueryParser.PARAMS, vars); diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java index ce9f5231949d1..8c3e8cc8fc9e0 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query.functionscore; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.MultiValueMode; @@ -48,7 +48,7 @@ public DecayFunctionBuilder(String fieldName, Object origin, Object scale) { public DecayFunctionBuilder setDecay(double decay) { if (decay <= 0 || decay >= 1.0) { - throw new ElasticsearchIllegalStateException("scale weight parameter must be in range 0..1!"); + throw new IllegalStateException("scale weight parameter must be in range 0..1!"); } this.decay = decay; return this; diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java index 9129a33d06481..0c9a779fc7d63 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.GeoDistance; @@ -428,16 +428,16 @@ public AbstractDistanceScoreFunction(double userSuppiedScale, double decay, doub super(CombineFunction.MULT); this.mode = mode; if (userSuppiedScale <= 0.0) { - throw new ElasticsearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : scale must be > 0.0."); + throw new IllegalArgumentException(FunctionScoreQueryParser.NAME + " : scale must be > 0.0."); } if (decay <= 0.0 || decay >= 1.0) { - throw new ElasticsearchIllegalArgumentException(FunctionScoreQueryParser.NAME + throw new IllegalArgumentException(FunctionScoreQueryParser.NAME + " : decay must be in the range [0..1]."); } this.scale = func.processScale(userSuppiedScale, decay); this.func = func; if (offset < 0.0d) { - throw new ElasticsearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : offset must be > 0.0"); + throw new IllegalArgumentException(FunctionScoreQueryParser.NAME + " : offset must be > 0.0"); } this.offset = offset; } diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java index 53804abfe6ce8..8c6897d75b123 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java @@ -19,9 +19,8 @@ package org.elasticsearch.index.query.functionscore; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.search.function.CombineFunction; -import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.BaseQueryBuilder; import org.elasticsearch.index.query.BoostableQueryBuilder; @@ -99,7 +98,7 @@ public FunctionScoreQueryBuilder() { */ public FunctionScoreQueryBuilder(ScoreFunctionBuilder scoreFunctionBuilder) { if (scoreFunctionBuilder == null) { - throw new ElasticsearchIllegalArgumentException("function_score: function must not be null"); + throw new IllegalArgumentException("function_score: function must not be null"); } queryBuilder = null; filterBuilder = null; @@ -115,7 +114,7 @@ public FunctionScoreQueryBuilder(ScoreFunctionBuilder scoreFunctionBuilder) { */ public FunctionScoreQueryBuilder add(FilterBuilder filter, ScoreFunctionBuilder scoreFunctionBuilder) { if (scoreFunctionBuilder == null) { - throw new ElasticsearchIllegalArgumentException("function_score: function must not be null"); + throw new IllegalArgumentException("function_score: function must not be null"); } this.filters.add(filter); this.scoreFunctions.add(scoreFunctionBuilder); @@ -129,7 +128,7 @@ public FunctionScoreQueryBuilder add(FilterBuilder filter, ScoreFunctionBuilder */ public FunctionScoreQueryBuilder add(ScoreFunctionBuilder scoreFunctionBuilder) { if (scoreFunctionBuilder == null) { - throw new ElasticsearchIllegalArgumentException("function_score: function must not be null"); + throw new IllegalArgumentException("function_score: function must not be null"); } this.filters.add(null); this.scoreFunctions.add(scoreFunctionBuilder); diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java index 286b32c7f7075..352ea1127de2b 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query.functionscore.factor; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.search.function.BoostScoreFunction; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder; @@ -58,7 +58,7 @@ public String getName() { @Override public ScoreFunctionBuilder setWeight(float weight) { - throw new ElasticsearchIllegalArgumentException(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE); + throw new IllegalArgumentException(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE); } @Override diff --git a/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java b/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java index 4dfba5fb3ecaf..cf8f629d6e727 100644 --- a/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java +++ b/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query.support; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; @@ -95,7 +95,7 @@ public static void parseCommonInnerHitOptions(XContentParser parser, XContentPar scriptFieldsParseElement.parse(parser, subSearchContext); break; default: - throw new ElasticsearchIllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); + throw new IllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); } } else if (token == XContentParser.Token.START_ARRAY) { switch (fieldName) { @@ -115,7 +115,7 @@ public static void parseCommonInnerHitOptions(XContentParser parser, XContentPar } break; default: - throw new ElasticsearchIllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); + throw new IllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); } } else if (token.isValue()) { switch (fieldName) { @@ -139,7 +139,7 @@ public static void parseCommonInnerHitOptions(XContentParser parser, XContentPar subSearchContext.fieldNames().add(parser.text()); break; default: - throw new ElasticsearchIllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); + throw new IllegalArgumentException("Unknown key for a " + token + " for nested query: [" + fieldName + "]."); } } } diff --git a/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java index 86b9e3717842a..2a0efa8aadb70 100644 --- a/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java +++ b/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java @@ -19,16 +19,10 @@ package org.elasticsearch.index.query.support; -import com.google.common.collect.ImmutableList; -import org.apache.lucene.search.Filter; -import org.apache.lucene.search.FilteredQuery; import org.apache.lucene.search.MultiTermQuery; -import org.apache.lucene.search.Query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; + +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.QueryParseContext; /** * @@ -89,7 +83,7 @@ public static MultiTermQuery.RewriteMethod parseRewriteMethod(@Nullable String r int size = Integer.parseInt(rewriteMethod.substring("topTerms".length())); return new MultiTermQuery.TopTermsScoringBooleanQueryRewrite(size); } - throw new ElasticsearchIllegalArgumentException("Failed to parse rewrite_method [" + rewriteMethod + "]"); + throw new IllegalArgumentException("Failed to parse rewrite_method [" + rewriteMethod + "]"); } } diff --git a/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/src/main/java/org/elasticsearch/index/search/MatchQuery.java index 730719739cd49..baecbf6f26559 100644 --- a/src/main/java/org/elasticsearch/index/search/MatchQuery.java +++ b/src/main/java/org/elasticsearch/index/search/MatchQuery.java @@ -25,8 +25,8 @@ import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.util.QueryBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; import org.elasticsearch.common.lucene.search.Queries; @@ -156,7 +156,7 @@ protected Analyzer getAnalyzer(FieldMapper mapper, MapperService.SmartNameFieldM } else { analyzer = parseContext.mapperService().analysisService().analyzer(this.analyzer); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("No analyzer found for [" + this.analyzer + "]"); + throw new IllegalArgumentException("No analyzer found for [" + this.analyzer + "]"); } } return analyzer; @@ -204,7 +204,7 @@ public Query parse(Type type, String fieldName, Object value) throws IOException query = builder.createPhrasePrefixQuery(field, value.toString(), phraseSlop, maxExpansions); break; default: - throw new ElasticsearchIllegalStateException("No type found for [" + type + "]"); + throw new IllegalStateException("No type found for [" + type + "]"); } if (query == null) { diff --git a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java index 0fdf44add4837..2d315c214fcaa 100644 --- a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java +++ b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.index.mapper.FieldMapper; @@ -83,7 +83,7 @@ public Query parse(MultiMatchQueryBuilder.Type type, Map fieldNam queryBuilder = new CrossFieldsQueryBuilder(tieBreaker); break; default: - throw new ElasticsearchIllegalStateException("No such type: " + type); + throw new IllegalStateException("No such type: " + type); } final List queries = queryBuilder.buildGroupedQueries(type, fieldNames, value, minimumShouldMatch); return queryBuilder.conbineGrouped(queries); diff --git a/src/main/java/org/elasticsearch/index/search/child/ScoreType.java b/src/main/java/org/elasticsearch/index/search/child/ScoreType.java index e0b84a14274a8..736744f7de2a7 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ScoreType.java +++ b/src/main/java/org/elasticsearch/index/search/child/ScoreType.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.search.child; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * Defines how scores from child documents are mapped into the parent document. @@ -66,7 +66,7 @@ public static ScoreType fromString(String type) { } else if ("total".equals(type)) { // This name is consistent with: ScoreMode.Total return SUM; } - throw new ElasticsearchIllegalArgumentException("No score type for child query [" + type + "] found"); + throw new IllegalArgumentException("No score type for child query [" + type + "] found"); } } diff --git a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java index 330ebe33f09f8..3c4d28b90d910 100644 --- a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.*; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.search.EmptyScorer; import org.apache.lucene.search.join.BitDocIdSetFilter; @@ -361,7 +361,7 @@ public float score() throws IOException { }; } - throw new ElasticsearchIllegalStateException("No support for score type [" + scoreType + "]"); + throw new IllegalStateException("No support for score type [" + scoreType + "]"); } return new EmptyScorer(this); } diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java index d3b9a4c0757fa..ec1580ec7ab5c 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.DocValuesDocIdSet; import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; @@ -73,7 +73,7 @@ public GeoDistanceFilter(double lat, double lon, double distance, GeoDistance ge boundingBoxFilter = IndexedGeoBoundingBoxFilter.create(distanceBoundingCheck.topLeft(), distanceBoundingCheck.bottomRight(), mapper); distanceBoundingCheck = GeoDistance.ALWAYS_INSTANCE; // fine, we do the bounding box check using the filter } else { - throw new ElasticsearchIllegalArgumentException("type [" + optimizeBbox + "] for bounding box optimization not supported"); + throw new IllegalArgumentException("type [" + optimizeBbox + "] for bounding box optimization not supported"); } } else { distanceBoundingCheck = GeoDistance.ALWAYS_INSTANCE; diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java index dcc08a01b6387..59cb14364a3ec 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; @@ -92,7 +92,7 @@ public GeoDistanceRangeFilter(GeoPoint point, Double lowerVal, Double upperVal, boundingBoxFilter = IndexedGeoBoundingBoxFilter.create(distanceBoundingCheck.topLeft(), distanceBoundingCheck.bottomRight(), mapper); distanceBoundingCheck = GeoDistance.ALWAYS_INSTANCE; // fine, we do the bounding box check using the filter } else { - throw new ElasticsearchIllegalArgumentException("type [" + optimizeBbox + "] for bounding box optimization not supported"); + throw new IllegalArgumentException("type [" + optimizeBbox + "] for bounding box optimization not supported"); } } else { distanceBoundingCheck = GeoDistance.ALWAYS_INSTANCE; diff --git a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java index 6c57c25177193..f0b4cd64545d7 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Filter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper; @@ -33,7 +33,7 @@ public class IndexedGeoBoundingBoxFilter { public static Filter create(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) { if (!fieldMapper.isEnableLatLon()) { - throw new ElasticsearchIllegalArgumentException("lat/lon is not enabled (indexed) for field [" + fieldMapper.name() + "], can't use indexed filter on it"); + throw new IllegalArgumentException("lat/lon is not enabled (indexed) for field [" + fieldMapper.name() + "], can't use indexed filter on it"); } //checks to see if bounding box crosses 180 degrees if (topLeft.lon() > bottomRight.lon()) { diff --git a/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java b/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java index bf8aa8eb4b3d7..feb4cea8f004c 100644 --- a/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java +++ b/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java @@ -19,8 +19,8 @@ package org.elasticsearch.index.search.shape; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; @@ -60,7 +60,7 @@ public ShapeFetchService(Client client, Settings settings) { public ShapeBuilder fetch(String id, String type, String index, String path) throws IOException { GetResponse response = client.get(new GetRequest(index, type, id).preference("_local").operationThreaded(false)).actionGet(); if (!response.isExists()) { - throw new ElasticsearchIllegalArgumentException("Shape with ID [" + id + "] in type [" + type + "] not found"); + throw new IllegalArgumentException("Shape with ID [" + id + "] in type [" + type + "] not found"); } String[] pathElements = Strings.splitStringToArray(path, '.'); @@ -83,7 +83,7 @@ public ShapeBuilder fetch(String id, String type, String index, String path) thr } } } - throw new ElasticsearchIllegalStateException("Shape with name [" + id + "] found but missing " + path + " field"); + throw new IllegalStateException("Shape with name [" + id + "] found but missing " + path + " field"); } finally { if (parser != null) { parser.close(); diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java index e7b2bbf9ec62c..4768b4eef8b1f 100644 --- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -31,8 +31,8 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.ThreadInterruptedException; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; @@ -340,7 +340,7 @@ public ShardRouting routingEntry() { public void updateRoutingEntry(final ShardRouting newRouting, final boolean persistState) { final ShardRouting currentRouting = this.shardRouting; if (!newRouting.shardId().equals(shardId())) { - throw new ElasticsearchIllegalArgumentException("Trying to set a routing entry with shardId [" + newRouting.shardId() + "] on a shard with shardId [" + shardId() + "]"); + throw new IllegalArgumentException("Trying to set a routing entry with shardId [" + newRouting.shardId() + "] on a shard with shardId [" + shardId() + "]"); } try { if (currentRouting != null) { @@ -997,7 +997,7 @@ public final boolean isFlushOnClose() { */ public void deleteShardState() throws IOException { if (this.routingEntry() != null && this.routingEntry().active()) { - throw new ElasticsearchIllegalStateException("Can't delete shard state on an active shard"); + throw new IllegalStateException("Can't delete shard state on an active shard"); } MetaDataStateFormat.deleteMetaState(shardPath().getDataPath()); } diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/src/main/java/org/elasticsearch/index/shard/IndexShardState.java index 1b4edcb10ba28..a97cc450f97e2 100644 --- a/src/main/java/org/elasticsearch/index/shard/IndexShardState.java +++ b/src/main/java/org/elasticsearch/index/shard/IndexShardState.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.shard; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * @@ -51,9 +51,9 @@ public byte id() { return this.id; } - public static IndexShardState fromId(byte id) throws ElasticsearchIllegalArgumentException { + public static IndexShardState fromId(byte id) throws IllegalArgumentException { if (id < 0 || id >= IDS.length) { - throw new ElasticsearchIllegalArgumentException("No mapping for id [" + id + "]"); + throw new IllegalArgumentException("No mapping for id [" + id + "]"); } return IDS[id]; } diff --git a/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java b/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java index a68d1289ff1ba..64f250678acaf 100644 --- a/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java +++ b/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.shard; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Nullable; @@ -98,7 +98,7 @@ public ShadowIndexShard(ShardId shardId, IndexSettingsService indexSettingsServi @Override public void updateRoutingEntry(ShardRouting newRouting, boolean persistState) { if (newRouting.primary() == true) {// becoming a primary - throw new ElasticsearchIllegalStateException("can't promote shard to primary"); + throw new IllegalStateException("can't promote shard to primary"); } super.updateRoutingEntry(newRouting, persistState); } diff --git a/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/src/main/java/org/elasticsearch/index/shard/ShardPath.java index f519aa546aa07..102d565d679de 100644 --- a/src/main/java/org/elasticsearch/index/shard/ShardPath.java +++ b/src/main/java/org/elasticsearch/index/shard/ShardPath.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.shard; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.logging.ESLogger; @@ -91,12 +91,12 @@ public static ShardPath loadShardPath(ESLogger logger, NodeEnvironment env, Shar ShardStateMetaData load = ShardStateMetaData.FORMAT.loadLatestState(logger, path); if (load != null) { if ((load.indexUUID.equals(indexUUID) || IndexMetaData.INDEX_UUID_NA_VALUE.equals(load.indexUUID)) == false) { - throw new ElasticsearchIllegalStateException(shardId + " index UUID in shard state was: " + load.indexUUID + " excepted: " + indexUUID + " on shard path: " + path); + throw new IllegalStateException(shardId + " index UUID in shard state was: " + load.indexUUID + " excepted: " + indexUUID + " on shard path: " + path); } if (loadedPath == null) { loadedPath = path; } else{ - throw new ElasticsearchIllegalStateException(shardId + " more than one shard state found"); + throw new IllegalStateException(shardId + " more than one shard state found"); } } diff --git a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java index cf933e8cf0c71..7d63b2cdd177f 100644 --- a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java +++ b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java @@ -19,14 +19,13 @@ package org.elasticsearch.index.shard; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.index.aliases.IndexAliasesService; import org.elasticsearch.index.cache.IndexCache; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.IgnoreOnRecoveryEngineException; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MapperAnalyzer; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperUtils; @@ -128,7 +127,7 @@ public void performRecoveryOperation(Engine engine, Translog.Operation operation deleteByQuery.source(), deleteByQuery.filteringAliases(), Engine.Operation.Origin.RECOVERY, deleteByQuery.types())); break; default: - throw new ElasticsearchIllegalStateException("No operation defined for [" + operation + "]"); + throw new IllegalStateException("No operation defined for [" + operation + "]"); } } catch (ElasticsearchException e) { boolean hasIgnoreOnRecoveryException = false; diff --git a/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java index 43f6091a70d39..48c5dc6f52149 100644 --- a/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.similarity; import org.apache.lucene.search.similarities.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; /** @@ -73,7 +73,7 @@ protected Normalization parseNormalization(Settings settings) { float z = settings.getAsFloat("normalization.z.z", 0.30f); return new NormalizationZ(z); } else { - throw new ElasticsearchIllegalArgumentException("Unsupported Normalization [" + normalization + "]"); + throw new IllegalArgumentException("Unsupported Normalization [" + normalization + "]"); } } } diff --git a/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java index c6c6a48a77b10..9c81bf0415ac5 100644 --- a/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.search.similarities.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -82,7 +82,7 @@ protected BasicModel parseBasicModel(Settings settings) { String basicModel = settings.get("basic_model"); BasicModel model = MODEL_CACHE.get(basicModel); if (model == null) { - throw new ElasticsearchIllegalArgumentException("Unsupported BasicModel [" + basicModel + "]"); + throw new IllegalArgumentException("Unsupported BasicModel [" + basicModel + "]"); } return model; } @@ -97,7 +97,7 @@ protected AfterEffect parseAfterEffect(Settings settings) { String afterEffect = settings.get("after_effect"); AfterEffect effect = EFFECT_CACHE.get(afterEffect); if (effect == null) { - throw new ElasticsearchIllegalArgumentException("Unsupported AfterEffect [" + afterEffect + "]"); + throw new IllegalArgumentException("Unsupported AfterEffect [" + afterEffect + "]"); } return effect; } diff --git a/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java index c5e9d2901e5d5..68eaccc741b58 100644 --- a/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.search.similarities.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -76,7 +76,7 @@ protected Distribution parseDistribution(Settings settings) { String rawDistribution = settings.get("distribution"); Distribution distribution = DISTRIBUTION_CACHE.get(rawDistribution); if (distribution == null) { - throw new ElasticsearchIllegalArgumentException("Unsupported Distribution [" + rawDistribution + "]"); + throw new IllegalArgumentException("Unsupported Distribution [" + rawDistribution + "]"); } return distribution; } @@ -91,7 +91,7 @@ protected Lambda parseLambda(Settings settings) { String rawLambda = settings.get("lambda"); Lambda lambda = LAMBDA_CACHE.get(rawLambda); if (lambda == null) { - throw new ElasticsearchIllegalArgumentException("Unsupported Lambda [" + rawLambda + "]"); + throw new IllegalArgumentException("Unsupported Lambda [" + rawLambda + "]"); } return lambda; } diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java index cbd7729e105d5..4a1c4578cdb32 100644 --- a/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java +++ b/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.similarity; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.Scopes; import org.elasticsearch.common.inject.assistedinject.FactoryProvider; @@ -71,7 +71,7 @@ protected void configure() { Class type = settings.getAsClass("type", null, "org.elasticsearch.index.similarity.", "SimilarityProvider"); if (type == null) { - throw new ElasticsearchIllegalArgumentException("SimilarityProvider [" + name + "] must have an associated type"); + throw new IllegalArgumentException("SimilarityProvider [" + name + "] must have an associated type"); } providers.put(name, type); } diff --git a/src/main/java/org/elasticsearch/index/store/Store.java b/src/main/java/org/elasticsearch/index/store/Store.java index 117547c98dfd8..166bd7d96c35e 100644 --- a/src/main/java/org/elasticsearch/index/store/Store.java +++ b/src/main/java/org/elasticsearch/index/store/Store.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.*; import org.apache.lucene.util.*; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; @@ -532,7 +532,7 @@ private static final void failIfCorrupted(Directory directory, ShardId shardId) * @param reason the reason for this cleanup operation logged for each deleted file * @param sourceMetaData the metadata used for cleanup. all files in this metadata should be kept around. * @throws IOException if an IOException occurs - * @throws ElasticsearchIllegalStateException if the latest snapshot in this store differs from the given one after the cleanup. + * @throws IllegalStateException if the latest snapshot in this store differs from the given one after the cleanup. */ public void cleanupAndVerify(String reason, MetadataSnapshot sourceMetaData) throws IOException { metadataLock.writeLock().lock(); @@ -553,7 +553,7 @@ public void cleanupAndVerify(String reason, MetadataSnapshot sourceMetaData) thr || existingFile.equals(IndexFileNames.OLD_SEGMENTS_GEN)) { // TODO do we need to also fail this if we can't delete the pending commit file? // if one of those files can't be deleted we better fail the cleanup otherwise we might leave an old commit point around? - throw new ElasticsearchIllegalStateException("Can't delete " + existingFile + " - cleanup failed", ex); + throw new IllegalStateException("Can't delete " + existingFile + " - cleanup failed", ex); } logger.debug("failed to delete file [{}]", ex, existingFile); // ignore, we don't really care, will get deleted later on @@ -592,12 +592,12 @@ final void verifyAfterCleanup(MetadataSnapshot sourceMetaData, MetadataSnapshot final boolean consistent = hashAndLengthEqual || same; if (consistent == false) { logger.debug("Files are different on the recovery target: {} ", recoveryDiff); - throw new ElasticsearchIllegalStateException("local version: " + local + " is different from remote version after recovery: " + remote, null); + throw new IllegalStateException("local version: " + local + " is different from remote version after recovery: " + remote, null); } } } else { logger.debug("Files are missing on the recovery target: {} ", recoveryDiff); - throw new ElasticsearchIllegalStateException("Files are missing on the recovery target: [different=" + throw new IllegalStateException("Files are missing on the recovery target: [different=" + recoveryDiff.different + ", missing=" + recoveryDiff.missing + ']', null); } } diff --git a/src/main/java/org/elasticsearch/index/translog/Translog.java b/src/main/java/org/elasticsearch/index/translog/Translog.java index 7d6a4b0a02ac4..bcf707c795b9f 100644 --- a/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -23,8 +23,8 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; @@ -269,7 +269,7 @@ public static Type fromId(byte id) { case 4: return DELETE_BY_QUERY; default: - throw new ElasticsearchIllegalArgumentException("No type mapped for [" + id + "]"); + throw new IllegalArgumentException("No type mapped for [" + id + "]"); } } } @@ -635,7 +635,7 @@ public VersionType versionType() { @Override public Source getSource(){ - throw new ElasticsearchIllegalStateException("trying to read doc source from delete operation"); + throw new IllegalStateException("trying to read doc source from delete operation"); } @Override @@ -709,7 +709,7 @@ public String[] types() { @Override public Source getSource() { - throw new ElasticsearchIllegalStateException("trying to read doc source from delete_by_query operation"); + throw new IllegalStateException("trying to read doc source from delete_by_query operation"); } @Override diff --git a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java index a6539847c4569..775c5cd7c4768 100644 --- a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java +++ b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.translog.fs; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.translog.Translog; @@ -49,13 +49,13 @@ public FsTranslogFile create(ShardId shardId, long id, ChannelReference channelR public abstract FsTranslogFile create(ShardId shardId, long id, ChannelReference raf, int bufferSize) throws IOException; - public static Type fromString(String type) throws ElasticsearchIllegalArgumentException { + public static Type fromString(String type) throws IllegalArgumentException { if (SIMPLE.name().equalsIgnoreCase(type)) { return SIMPLE; } else if (BUFFERED.name().equalsIgnoreCase(type)) { return BUFFERED; } - throw new ElasticsearchIllegalArgumentException("No translog fs type [" + type + "]"); + throw new IllegalArgumentException("No translog fs type [" + type + "]"); } } diff --git a/src/main/java/org/elasticsearch/indices/IndicesService.java b/src/main/java/org/elasticsearch/indices/IndicesService.java index a78a0b4fd79c8..579eca91b721c 100644 --- a/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -25,8 +25,8 @@ import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.stats.CommonStats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag; @@ -282,7 +282,7 @@ public IndexService indexServiceSafe(String index) throws IndexMissingException public synchronized IndexService createIndex(String sIndexName, @IndexSettings Settings settings, String localNodeId) throws ElasticsearchException { if (!lifecycle.started()) { - throw new ElasticsearchIllegalStateException("Can't create an index [" + sIndexName + "], node is closed"); + throw new IllegalStateException("Can't create an index [" + sIndexName + "], node is closed"); } Index index = new Index(sIndexName); if (indices.containsKey(index.name())) { @@ -449,7 +449,7 @@ public void deleteClosedIndex(String reason, IndexMetaData metaData, ClusterStat try { if (clusterState.metaData().hasIndex(indexName)) { final IndexMetaData index = clusterState.metaData().index(indexName); - throw new ElasticsearchIllegalStateException("Can't delete closed index store for [" + indexName + "] - it's still part of the cluster state [" + index.getUUID() + "] [" + metaData.getUUID() + "]"); + throw new IllegalStateException("Can't delete closed index store for [" + indexName + "] - it's still part of the cluster state [" + index.getUUID() + "] [" + metaData.getUUID() + "]"); } deleteIndexStore(reason, metaData, clusterState); } catch (IOException e) { @@ -468,13 +468,13 @@ public void deleteIndexStore(String reason, IndexMetaData metaData, ClusterState String indexName = metaData.index(); if (indices.containsKey(indexName)) { String localUUid = indices.get(indexName).v1().indexUUID(); - throw new ElasticsearchIllegalStateException("Can't delete index store for [" + indexName + "] - it's still part of the indices service [" + localUUid+ "] [" + metaData.getUUID() + "]"); + throw new IllegalStateException("Can't delete index store for [" + indexName + "] - it's still part of the indices service [" + localUUid+ "] [" + metaData.getUUID() + "]"); } if (clusterState.metaData().hasIndex(indexName) && (clusterState.nodes().localNode().masterNode() == true)) { // we do not delete the store if it is a master eligible node and the index is still in the cluster state // because we want to keep the meta data for indices around even if no shards are left here final IndexMetaData index = clusterState.metaData().index(indexName); - throw new ElasticsearchIllegalStateException("Can't delete closed index store for [" + indexName + "] - it's still part of the cluster state [" + index.getUUID() + "] [" + metaData.getUUID() + "]"); + throw new IllegalStateException("Can't delete closed index store for [" + indexName + "] - it's still part of the cluster state [" + index.getUUID() + "] [" + metaData.getUUID() + "]"); } } Index index = new Index(metaData.index()); @@ -533,7 +533,7 @@ public void deleteShardStore(String reason, ShardLock lock, Settings indexSettin public void deleteShardStore(String reason, ShardId shardId, IndexMetaData metaData) throws IOException { final Settings indexSettings = buildIndexSettings(metaData); if (canDeleteShardContent(shardId, indexSettings) == false) { - throw new ElasticsearchIllegalStateException("Can't delete shard " + shardId); + throw new IllegalStateException("Can't delete shard " + shardId); } nodeEnv.deleteShardDirectorySafe(shardId, indexSettings); logger.trace("{} deleting shard reason [{}]", shardId, reason); @@ -614,10 +614,10 @@ private Settings buildIndexSettings(IndexMetaData metaData) { */ public void addPendingDelete(ShardId shardId, @IndexSettings Settings settings) { if (shardId == null) { - throw new ElasticsearchIllegalArgumentException("shardId must not be null"); + throw new IllegalArgumentException("shardId must not be null"); } if (settings == null) { - throw new ElasticsearchIllegalArgumentException("settings must not be null"); + throw new IllegalArgumentException("settings must not be null"); } PendingDelete pendingDelete = new PendingDelete(shardId, settings, false); addPendingDelete(shardId.index(), pendingDelete); diff --git a/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java index db9717356ac0e..34e1feec60725 100644 --- a/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java +++ b/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices.breaker; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.breaker.ChildMemoryCircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreakingException; @@ -164,9 +164,9 @@ public void onRefreshSettings(Settings settings) { /** * Validate that child settings are valid - * @throws ElasticsearchIllegalStateException + * @throws IllegalStateException */ - public static void validateSettings(BreakerSettings[] childrenSettings) throws ElasticsearchIllegalStateException { + public static void validateSettings(BreakerSettings[] childrenSettings) throws IllegalStateException { for (BreakerSettings childSettings : childrenSettings) { // If the child is disabled, ignore it if (childSettings.getLimit() == -1) { @@ -174,7 +174,7 @@ public static void validateSettings(BreakerSettings[] childrenSettings) throws E } if (childSettings.getOverhead() < 0) { - throw new ElasticsearchIllegalStateException("Child breaker overhead " + childSettings + " must be non-negative"); + throw new IllegalStateException("Child breaker overhead " + childSettings + " must be non-negative"); } } } diff --git a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java index 9fdc0c8ea349f..c0b9458f9526c 100644 --- a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java +++ b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java @@ -26,7 +26,7 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import org.apache.lucene.search.DocIdSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -87,7 +87,7 @@ public void onRefreshSettings(Settings settings) { } final int concurrencyLevel = settings.getAsInt(INDICES_CACHE_FILTER_CONCURRENCY_LEVEL, IndicesFilterCache.this.concurrencyLevel); if (concurrencyLevel <= 0) { - throw new ElasticsearchIllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); + throw new IllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); } if (!Objects.equal(concurrencyLevel, IndicesFilterCache.this.concurrencyLevel)) { logger.info("updating [{}] from [{}] to [{}]", @@ -112,13 +112,13 @@ public IndicesFilterCache(Settings settings, ThreadPool threadPool, NodeSettings this.expire = settings.getAsTime(INDICES_CACHE_FILTER_EXPIRE, null); this.minimumEntryWeight = settings.getAsInt(INDICES_CACHE_FILTER_MINIMUM_ENTRY_WEIGHT, 1024); // 1k per entry minimum if (minimumEntryWeight <= 0) { - throw new ElasticsearchIllegalArgumentException("minimum_entry_weight must be > 0 but was: " + minimumEntryWeight); + throw new IllegalArgumentException("minimum_entry_weight must be > 0 but was: " + minimumEntryWeight); } this.cleanInterval = settings.getAsTime(INDICES_CACHE_FILTER_CLEAN_INTERVAL, TimeValue.timeValueSeconds(60)); // defaults to 4, but this is a busy map for all indices, increase it a bit this.concurrencyLevel = settings.getAsInt(INDICES_CACHE_FILTER_CONCURRENCY_LEVEL, 16); if (concurrencyLevel <= 0) { - throw new ElasticsearchIllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); + throw new IllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); } computeSizeInBytes(); buildCache(); diff --git a/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java b/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java index 5daf3682a1f7d..d8a2b101fcc46 100644 --- a/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java +++ b/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java @@ -31,7 +31,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -120,7 +120,7 @@ public IndicesQueryCache(Settings settings, ClusterService clusterService, Threa // defaults to 4, but this is a busy map for all indices, increase it a bit by default this.concurrencyLevel = settings.getAsInt(INDICES_CACHE_QUERY_CONCURRENCY_LEVEL, 16); if (concurrencyLevel <= 0) { - throw new ElasticsearchIllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); + throw new IllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); } buildCache(); diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index b10ff5d5bea4a..7a068641c511f 100644 --- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -25,8 +25,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; -import org.elasticsearch.ExceptionsHelper; +import java.lang.IllegalStateException; + import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -783,7 +783,7 @@ private DiscoveryNode findSourceNodeForPeerRecovery(RoutingTable routingTable, D logger.trace("can't find relocation source node for shard {} because it is assigned to an unknown node [{}].", shardRouting.shardId(), shardRouting.relocatingNodeId()); } } else { - throw new ElasticsearchIllegalStateException("trying to find source node for peer recovery when routing state means no peer recovery: " + shardRouting); + throw new IllegalStateException("trying to find source node for peer recovery when routing state means no peer recovery: " + shardRouting); } return sourceNode; } diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java index b1e8393a96a74..3c5ef7d63c413 100644 --- a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java +++ b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.SegmentReader; import org.apache.lucene.util.Accountable; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; @@ -80,7 +80,7 @@ public IndicesFieldDataCache(Settings settings, IndicesFieldDataCacheListener in // defaults to 4, but this is a busy map for all indices, increase it a bit by default final int concurrencyLevel = settings.getAsInt(FIELDDATA_CACHE_CONCURRENCY_LEVEL, 16); if (concurrencyLevel <= 0) { - throw new ElasticsearchIllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); + throw new IllegalArgumentException("concurrency_level must be > 0 but was: " + concurrencyLevel); } cacheBuilder.concurrencyLevel(concurrencyLevel); if (expire != null && expire.millis() > 0) { diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java index 2e9f11efa82b7..c465aeae70e06 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java +++ b/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java @@ -20,8 +20,8 @@ package org.elasticsearch.indices.recovery; import com.google.common.collect.ImmutableList; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.RestoreSource; import org.elasticsearch.common.Nullable; @@ -82,9 +82,9 @@ public byte id() { return id; } - public static Stage fromId(byte id) throws ElasticsearchIllegalArgumentException { + public static Stage fromId(byte id) throws IllegalArgumentException { if (id < 0 || id >= STAGES.length) { - throw new ElasticsearchIllegalArgumentException("No mapping for id [" + id + "]"); + throw new IllegalArgumentException("No mapping for id [" + id + "]"); } return STAGES[id]; } @@ -115,9 +115,9 @@ public byte id() { return id; } - public static Type fromId(byte id) throws ElasticsearchIllegalArgumentException { + public static Type fromId(byte id) throws IllegalArgumentException { if (id < 0 || id >= TYPES.length) { - throw new ElasticsearchIllegalArgumentException("No mapping for id [" + id + "]"); + throw new IllegalArgumentException("No mapping for id [" + id + "]"); } return TYPES[id]; } @@ -170,7 +170,7 @@ public synchronized Stage getStage() { private void validateAndSetStage(Stage expected, Stage next) { if (stage != expected) { - throw new ElasticsearchIllegalStateException("can't move recovery to stage [" + next + "]. current stage: [" + throw new IllegalStateException("can't move recovery to stage [" + next + "]. current stage: [" + stage + "] (expected [" + expected + "])"); } stage = next; @@ -209,7 +209,7 @@ public synchronized RecoveryState setStage(Stage stage) { getTimer().stop(); break; default: - throw new ElasticsearchIllegalArgumentException("unknown RecoveryState.Stage [" + stage + "]"); + throw new IllegalArgumentException("unknown RecoveryState.Stage [" + stage + "]"); } return this; } diff --git a/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java b/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java index b347f662a1ef5..0fc7c209111f2 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java +++ b/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java @@ -20,7 +20,7 @@ package org.elasticsearch.indices.recovery; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.action.index.MappingUpdatedAction; import org.elasticsearch.common.logging.ESLogger; @@ -51,7 +51,7 @@ public void phase1(SnapshotIndexCommit snapshot) throws ElasticsearchException { // here we simply fail the primary shard since we can't move them (have 2 writers open at the same time) // by failing the shard we play safe and just go through the entire reallocation procedure of the primary // it would be ideal to make sure we flushed the translog here but that is not possible in the current design. - ElasticsearchIllegalStateException exception = new ElasticsearchIllegalStateException("Can't relocate primary - failing"); + IllegalStateException exception = new IllegalStateException("Can't relocate primary - failing"); shard.failShard("primary_relocation", exception); throw exception; } diff --git a/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java index d9b4f5c2462e9..911d6a6445a16 100644 --- a/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java +++ b/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.jvm; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.unit.TimeValue; @@ -75,7 +75,7 @@ public HotThreads type(String type) { if ("cpu".equals(type) || "wait".equals(type) || "block".equals(type)) { this.type = type; } else { - throw new ElasticsearchIllegalArgumentException("type not supported [" + type + "]"); + throw new IllegalArgumentException("type not supported [" + type + "]"); } return this; } diff --git a/src/main/java/org/elasticsearch/node/Node.java b/src/main/java/org/elasticsearch/node/Node.java index b3be8cd5a87ff..603898dcbaeac 100644 --- a/src/main/java/org/elasticsearch/node/Node.java +++ b/src/main/java/org/elasticsearch/node/Node.java @@ -21,7 +21,7 @@ import org.elasticsearch.Build; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionModule; import org.elasticsearch.cache.recycler.PageCacheRecycler; @@ -157,7 +157,7 @@ public Node(Settings preparedSettings, boolean loadConfigSettings) throws Elasti try { nodeEnvironment = new NodeEnvironment(this.settings, this.environment); } catch (IOException ex) { - throw new ElasticsearchIllegalStateException("Failed to created node environment", ex); + throw new IllegalStateException("Failed to created node environment", ex); } boolean success = false; diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorService.java b/src/main/java/org/elasticsearch/percolator/PercolatorService.java index 6723372f1c8d5..958b1a55963da 100644 --- a/src/main/java/org/elasticsearch/percolator/PercolatorService.java +++ b/src/main/java/org/elasticsearch/percolator/PercolatorService.java @@ -36,7 +36,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CloseableThreadLocal; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.action.percolate.PercolateShardRequest; @@ -196,7 +196,7 @@ public PercolateShardResponse percolate(PercolateShardRequest request) { if (request.docSource() != null && request.docSource().length() != 0) { parsedDocument = parseFetchedDoc(context, request.docSource(), percolateIndexService, request.documentType()); } else if (parsedDocument == null) { - throw new ElasticsearchIllegalArgumentException("Nothing to percolate"); + throw new IllegalArgumentException("Nothing to percolate"); } if (context.percolateQuery() == null && (context.trackScores() || context.doSort || context.aggregations() != null) || context.aliasFilter() != null) { @@ -204,11 +204,11 @@ public PercolateShardResponse percolate(PercolateShardRequest request) { } if (context.doSort && !context.limit) { - throw new ElasticsearchIllegalArgumentException("Can't sort if size isn't specified"); + throw new IllegalArgumentException("Can't sort if size isn't specified"); } if (context.highlight() != null && !context.limit) { - throw new ElasticsearchIllegalArgumentException("Can't highlight if size isn't specified"); + throw new IllegalArgumentException("Can't highlight if size isn't specified"); } if (context.size() < 0) { diff --git a/src/main/java/org/elasticsearch/plugins/PluginManager.java b/src/main/java/org/elasticsearch/plugins/PluginManager.java index fbd89b9f27a15..5678c03fdb963 100644 --- a/src/main/java/org/elasticsearch/plugins/PluginManager.java +++ b/src/main/java/org/elasticsearch/plugins/PluginManager.java @@ -119,7 +119,7 @@ public void checkServerTrusted( public void downloadAndExtract(String name) throws IOException { if (name == null) { - throw new ElasticsearchIllegalArgumentException("plugin name must be supplied with --install [name]."); + throw new IllegalArgumentException("plugin name must be supplied with --install [name]."); } HttpDownloadHelper downloadHelper = new HttpDownloadHelper(); boolean downloaded = false; @@ -293,7 +293,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO public void removePlugin(String name) throws IOException { if (name == null) { - throw new ElasticsearchIllegalArgumentException("plugin name must be supplied with --remove [name]."); + throw new IllegalArgumentException("plugin name must be supplied with --remove [name]."); } PluginHandle pluginHandle = PluginHandle.parse(name); boolean removed = false; @@ -342,7 +342,7 @@ public void removePlugin(String name) throws IOException { private static void checkForForbiddenName(String name) { if (!hasLength(name) || BLACKLIST.contains(name.toLowerCase(Locale.ROOT))) { - throw new ElasticsearchIllegalArgumentException("Illegal plugin name: " + name); + throw new IllegalArgumentException("Illegal plugin name: " + name); } } @@ -485,7 +485,7 @@ public static void main(String[] args) { pluginManager.log("-> Removing " + Strings.nullToEmpty(pluginName) + "..."); pluginManager.removePlugin(pluginName); exitCode = EXIT_CODE_OK; - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { exitCode = EXIT_CODE_CMD_USAGE; pluginManager.log("Failed to remove " + pluginName + ", reason: " + e.getMessage()); } catch (IOException e) { @@ -526,12 +526,12 @@ public static void main(String[] args) { * @return Never {@code null}. The trimmed value. * @throws NullPointerException if {@code args} is {@code null}. * @throws ArrayIndexOutOfBoundsException if {@code arg} is negative. - * @throws ElasticsearchIllegalStateException if {@code arg} is >= {@code args.length}. - * @throws ElasticsearchIllegalArgumentException if the value evaluates to blank ({@code null} or only whitespace) + * @throws IllegalStateException if {@code arg} is >= {@code args.length}. + * @throws IllegalArgumentException if the value evaluates to blank ({@code null} or only whitespace) */ private static String getCommandValue(String[] args, int arg, String flag) { if (arg >= args.length) { - throw new ElasticsearchIllegalStateException("missing value for " + flag + ". Usage: " + flag + " [value]"); + throw new IllegalStateException("missing value for " + flag + ". Usage: " + flag + " [value]"); } // avoid having to interpret multiple forms of unset @@ -539,7 +539,7 @@ private static String getCommandValue(String[] args, int arg, String flag) { // If we had a value that is blank, then fail immediately if (trimmedValue == null) { - throw new ElasticsearchIllegalArgumentException( + throw new IllegalArgumentException( "value for " + flag + "('" + args[arg] + "') must be set. Usage: " + flag + " [value]"); } diff --git a/src/main/java/org/elasticsearch/plugins/PluginsService.java b/src/main/java/org/elasticsearch/plugins/PluginsService.java index 7a7c569acbe57..a260a997ceddf 100644 --- a/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -25,7 +25,7 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.info.PluginInfo; import org.elasticsearch.action.admin.cluster.node.info.PluginsInfo; @@ -123,7 +123,7 @@ public PluginsService(Settings settings, Environment environment) { try { loadPluginsIntoClassLoader(); } catch (IOException ex) { - throw new ElasticsearchIllegalStateException("Can't load plugins into classloader", ex); + throw new IllegalStateException("Can't load plugins into classloader", ex); } if (loadClasspathPlugins) { tupleBuilder.addAll(loadPluginsFromClasspath(settings)); @@ -147,7 +147,7 @@ public PluginsService(Settings settings, Environment environment) { sitePlugins.add(tuple.v1().getName()); } } catch (IOException ex) { - throw new ElasticsearchIllegalStateException("Can't load site plugins", ex); + throw new IllegalStateException("Can't load site plugins", ex); } // Checking expected plugins diff --git a/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/src/main/java/org/elasticsearch/repositories/RepositoriesService.java index 36fbf05c2ecd4..08454424ab0e4 100644 --- a/src/main/java/org/elasticsearch/repositories/RepositoriesService.java +++ b/src/main/java/org/elasticsearch/repositories/RepositoriesService.java @@ -21,8 +21,8 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; + +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.ack.ClusterStateUpdateRequest; @@ -34,7 +34,6 @@ import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Injector; -import org.elasticsearch.common.inject.Injectors; import org.elasticsearch.common.inject.ModulesBuilder; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; @@ -413,7 +412,7 @@ private RepositoryHolder createRepositoryHolder(RepositoryMetaData repositoryMet private void ensureRepositoryNotInUse(ClusterState clusterState, String repository) { if (SnapshotsService.isRepositoryInUse(clusterState, repository) || RestoreService.isRepositoryInUse(clusterState, repository)) { - throw new ElasticsearchIllegalStateException("trying to modify or unregister repository that is currently used "); + throw new IllegalStateException("trying to modify or unregister repository that is currently used "); } } diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index d8e3569c3d7d0..d7018947ac351 100644 --- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -26,7 +26,6 @@ import com.google.common.io.ByteStreams; import org.apache.lucene.store.RateLimiter; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; diff --git a/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/src/main/java/org/elasticsearch/rest/BaseRestHandler.java index d3939bb8c6096..9b83c2648b3d9 100644 --- a/src/main/java/org/elasticsearch/rest/BaseRestHandler.java +++ b/src/main/java/org/elasticsearch/rest/BaseRestHandler.java @@ -19,19 +19,13 @@ package org.elasticsearch.rest; -import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.*; import org.elasticsearch.client.Client; import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.FilterClient; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.rest.action.support.RestActions; import java.util.Set; diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java index 3aae11c30f2a2..9535fa7237ab4 100644 --- a/src/main/java/org/elasticsearch/rest/RestController.java +++ b/src/main/java/org/elasticsearch/rest/RestController.java @@ -21,8 +21,8 @@ import com.google.common.collect.ImmutableSet; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; @@ -136,7 +136,7 @@ public void registerHandler(RestRequest.Method method, String path, RestHandler headHandlers.insert(path, handler); break; default: - throw new ElasticsearchIllegalArgumentException("Can't handle [" + method + "] for path [" + path + "]"); + throw new IllegalArgumentException("Can't handle [" + method + "] for path [" + path + "]"); } } @@ -260,7 +260,7 @@ public void continueProcessing(RestRequest request, RestChannel channel) { try { int loc = index.getAndIncrement(); if (loc > filters.length) { - throw new ElasticsearchIllegalStateException("filter continueProcessing was called more than expected"); + throw new IllegalStateException("filter continueProcessing was called more than expected"); } else if (loc == filters.length) { executionFilter.process(request, channel, this); } else { diff --git a/src/main/java/org/elasticsearch/rest/RestRequest.java b/src/main/java/org/elasticsearch/rest/RestRequest.java index a908e5c55a76d..d54195068bef0 100644 --- a/src/main/java/org/elasticsearch/rest/RestRequest.java +++ b/src/main/java/org/elasticsearch/rest/RestRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.ContextHolder; import org.elasticsearch.common.Nullable; @@ -97,7 +97,7 @@ public float paramAsFloat(String key, float defaultValue) { try { return Float.parseFloat(sValue); } catch (NumberFormatException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse float parameter [" + key + "] with value [" + sValue + "]", e); + throw new IllegalArgumentException("Failed to parse float parameter [" + key + "] with value [" + sValue + "]", e); } } @@ -109,7 +109,7 @@ public int paramAsInt(String key, int defaultValue) { try { return Integer.parseInt(sValue); } catch (NumberFormatException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse int parameter [" + key + "] with value [" + sValue + "]", e); + throw new IllegalArgumentException("Failed to parse int parameter [" + key + "] with value [" + sValue + "]", e); } } @@ -121,7 +121,7 @@ public long paramAsLong(String key, long defaultValue) { try { return Long.parseLong(sValue); } catch (NumberFormatException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse int parameter [" + key + "] with value [" + sValue + "]", e); + throw new IllegalArgumentException("Failed to parse int parameter [" + key + "] with value [" + sValue + "]", e); } } diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java index 423d1c0f73b64..9c697afdfe138 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.admin.indices.alias; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.client.Client; @@ -62,7 +62,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, indicesAliasesRequest.timeout(request.paramAsTime("timeout", indicesAliasesRequest.timeout())); XContentParser.Token token = parser.nextToken(); if (token == null) { - throw new ElasticsearchIllegalArgumentException("No action is specified"); + throw new IllegalArgumentException("No action is specified"); } while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token == XContentParser.Token.START_ARRAY) { @@ -75,7 +75,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, } else if ("remove".equals(action)) { type = AliasAction.Type.REMOVE; } else { - throw new ElasticsearchIllegalArgumentException("Alias action [" + action + "] not supported"); + throw new IllegalArgumentException("Alias action [" + action + "] not supported"); } String index = null; String alias = null; diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java index 227deb11918ed..0e0e2736b0d3a 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.rest.action.admin.indices.alias.put; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; @@ -75,7 +75,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, try (XContentParser parser = XContentFactory.xContent(request.content()).createParser(request.content())) { XContentParser.Token token = parser.nextToken(); if (token == null) { - throw new ElasticsearchIllegalArgumentException("No index alias is specified"); + throw new IllegalArgumentException("No index alias is specified"); } String currentFieldName = null; while ((token = parser.nextToken()) != null) { diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java index f59675968091d..77fd1b89fd36e 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java @@ -19,15 +19,13 @@ package org.elasticsearch.rest.action.admin.indices.analyze; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; @@ -86,10 +84,10 @@ public void handleRequest(final RestRequest request, final RestChannel channel, client.admin().indices().analyze(analyzeRequest, new RestToXContentListener(channel)); } - public static void buildFromContent(BytesReference content, AnalyzeRequest analyzeRequest) throws ElasticsearchIllegalArgumentException { + public static void buildFromContent(BytesReference content, AnalyzeRequest analyzeRequest) throws IllegalArgumentException { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Malforrmed content, must start with an object"); + throw new IllegalArgumentException("Malforrmed content, must start with an object"); } else { XContentParser.Token token; String currentFieldName = null; @@ -110,7 +108,7 @@ public static void buildFromContent(BytesReference content, AnalyzeRequest analy List filters = Lists.newArrayList(); while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token.isValue() == false) { - throw new ElasticsearchIllegalArgumentException(currentFieldName + " array element should only contain token filter's name"); + throw new IllegalArgumentException(currentFieldName + " array element should only contain token filter's name"); } filters.add(parser.text()); } @@ -119,18 +117,18 @@ public static void buildFromContent(BytesReference content, AnalyzeRequest analy List charFilters = Lists.newArrayList(); while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token.isValue() == false) { - throw new ElasticsearchIllegalArgumentException(currentFieldName + " array element should only contain char filter's name"); + throw new IllegalArgumentException(currentFieldName + " array element should only contain char filter's name"); } charFilters.add(parser.text()); } analyzeRequest.tokenFilters(charFilters.toArray(new String[0])); } else { - throw new ElasticsearchIllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); + throw new IllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); } } } } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse request body", e); + throw new IllegalArgumentException("Failed to parse request body", e); } } } diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java index dc800f370620e..678965adc8599 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java @@ -21,7 +21,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableList; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.get.GetIndexRequest; import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature; import org.elasticsearch.action.admin.indices.get.GetIndexResponse; @@ -105,7 +105,7 @@ public RestResponse buildResponse(GetIndexResponse response, XContentBuilder bui writeWarmers(response.warmers().get(index), builder, request); break; default: - throw new ElasticsearchIllegalStateException("feature [" + feature + "] is not valid"); + throw new IllegalStateException("feature [" + feature + "] is not valid"); } } builder.endObject(); diff --git a/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java b/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java index 091ab27e38793..a5d5b89d1a0ab 100644 --- a/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java +++ b/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.count; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.count.CountRequest; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.support.IndicesOptions; @@ -75,7 +75,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, final int terminateAfter = request.paramAsInt("terminate_after", DEFAULT_TERMINATE_AFTER); if (terminateAfter < 0) { - throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0"); + throw new IllegalArgumentException("terminateAfter must be > 0"); } else if (terminateAfter > 0) { countRequest.terminateAfter(terminateAfter); } diff --git a/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java b/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java index 39fe00c663ad6..aeb903aafd2f8 100644 --- a/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java +++ b/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java @@ -20,13 +20,12 @@ package org.elasticsearch.rest.action.explain; import org.apache.lucene.search.Explanation; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.explain.ExplainRequest; import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.client.Client; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -81,7 +80,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, } else if ("AND".equals(defaultOperator)) { queryStringBuilder.defaultOperator(QueryStringQueryBuilder.Operator.AND); } else { - throw new ElasticsearchIllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); + throw new IllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); } } diff --git a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java index e196d954a7cd1..c519238ea8c63 100644 --- a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java +++ b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.index; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionWriteResponse; import org.elasticsearch.action.WriteConsistencyLevel; import org.elasticsearch.action.index.IndexRequest; @@ -88,7 +88,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, if (sOpType != null) { try { indexRequest.opType(IndexRequest.OpType.fromString(sOpType)); - } catch (ElasticsearchIllegalArgumentException eia){ + } catch (IllegalArgumentException eia){ try { XContentBuilder builder = channel.newBuilder(); channel.sendResponse(new BytesRestResponse(BAD_REQUEST, builder.startObject().field("error", eia.getMessage()).endObject())); diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java index aab5774af9ab5..46504cbf6bfd8 100644 --- a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java +++ b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.rest.action.script; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse; @@ -84,7 +84,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, if (sOpType != null) { try { putRequest.opType(IndexRequest.OpType.fromString(sOpType)); - } catch (ElasticsearchIllegalArgumentException eia){ + } catch (IllegalArgumentException eia){ try { XContentBuilder builder = channel.newBuilder(); channel.sendResponse(new BytesRestResponse(BAD_REQUEST, builder.startObject().field("error", eia.getMessage()).endObject())); diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java index 1dfff7cf4fe3a..4fc2c2f00ad0f 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.search; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.ClearScrollRequest; import org.elasticsearch.action.search.ClearScrollResponse; import org.elasticsearch.client.Client; @@ -27,7 +27,6 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; @@ -79,10 +78,10 @@ public static String[] splitScrollIds(String scrollIds) { return Strings.splitStringByCommaToArray(scrollIds); } - public static void buildFromContent(BytesReference content, ClearScrollRequest clearScrollRequest) throws ElasticsearchIllegalArgumentException { + public static void buildFromContent(BytesReference content, ClearScrollRequest clearScrollRequest) throws IllegalArgumentException { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Malformed content, must start with an object"); + throw new IllegalArgumentException("Malformed content, must start with an object"); } else { XContentParser.Token token; String currentFieldName = null; @@ -92,17 +91,17 @@ public static void buildFromContent(BytesReference content, ClearScrollRequest c } else if ("scroll_id".equals(currentFieldName) && token == XContentParser.Token.START_ARRAY) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { if (token.isValue() == false) { - throw new ElasticsearchIllegalArgumentException("scroll_id array element should only contain scroll_id"); + throw new IllegalArgumentException("scroll_id array element should only contain scroll_id"); } clearScrollRequest.addScrollId(parser.text()); } } else { - throw new ElasticsearchIllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); + throw new IllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); } } } } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse request body", e); + throw new IllegalArgumentException("Failed to parse request body", e); } } diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java index f578d3baa6a10..b503720463982 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.search; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.IndicesOptions; @@ -130,7 +130,7 @@ public static SearchSourceBuilder parseSearchSource(RestRequest request) { } else if ("AND".equals(defaultOperator)) { queryBuilder.defaultOperator(QueryStringQueryBuilder.Operator.AND); } else { - throw new ElasticsearchIllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); + throw new IllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); } } if (searchSourceBuilder == null) { @@ -179,7 +179,7 @@ public static SearchSourceBuilder parseSearchSource(RestRequest request) { int terminateAfter = request.paramAsInt("terminate_after", SearchContext.DEFAULT_TERMINATE_AFTER); if (terminateAfter < 0) { - throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0"); + throw new IllegalArgumentException("terminateAfter must be > 0"); } else if (terminateAfter > 0) { searchSourceBuilder.terminateAfter(terminateAfter); } diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java index 98edaa2cceae9..86549b93fad1d 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java @@ -19,11 +19,10 @@ package org.elasticsearch.rest.action.search; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.client.Client; -import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -84,10 +83,10 @@ public void handleRequest(final RestRequest request, final RestChannel channel, client.searchScroll(searchScrollRequest, new RestStatusToXContentListener(channel)); } - public static void buildFromContent(BytesReference content, SearchScrollRequest searchScrollRequest) throws ElasticsearchIllegalArgumentException { + public static void buildFromContent(BytesReference content, SearchScrollRequest searchScrollRequest) throws IllegalArgumentException { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Malforrmed content, must start with an object"); + throw new IllegalArgumentException("Malforrmed content, must start with an object"); } else { XContentParser.Token token; String currentFieldName = null; @@ -99,12 +98,12 @@ public static void buildFromContent(BytesReference content, SearchScrollRequest } else if ("scroll".equals(currentFieldName) && token == XContentParser.Token.VALUE_STRING) { searchScrollRequest.scroll(new Scroll(TimeValue.parseTimeValue(parser.text(), null))); } else { - throw new ElasticsearchIllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); + throw new IllegalArgumentException("Unknown parameter [" + currentFieldName + "] in request body or parameter is of the wrong type[" + token + "] "); } } } } catch (IOException e) { - throw new ElasticsearchIllegalArgumentException("Failed to parse request body", e); + throw new IllegalArgumentException("Failed to parse request body", e); } } } diff --git a/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java b/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java index eebea7973cdd1..4af6e7b59e66a 100644 --- a/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java +++ b/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java @@ -22,7 +22,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastShardsHeader; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.suggest.SuggestRequest; import org.elasticsearch.action.suggest.SuggestResponse; import org.elasticsearch.action.support.IndicesOptions; @@ -64,7 +64,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, if (RestActions.hasBodyContent(request)) { suggestRequest.suggest(RestActions.getRestContent(request)); } else { - throw new ElasticsearchIllegalArgumentException("no content or source provided to execute suggestion"); + throw new IllegalArgumentException("no content or source provided to execute suggestion"); } suggestRequest.routing(request.param("routing")); suggestRequest.preference(request.param("preference")); diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java index 38dd78bf403df..4a17a1b17dcce 100644 --- a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java +++ b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java @@ -19,7 +19,7 @@ package org.elasticsearch.rest.action.support; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; @@ -106,7 +106,7 @@ public static QuerySourceBuilder parseQuerySource(RestRequest request) { } else if ("AND".equals(defaultOperator)) { queryBuilder.defaultOperator(QueryStringQueryBuilder.Operator.AND); } else { - throw new ElasticsearchIllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); + throw new IllegalArgumentException("Unsupported defaultOperator [" + defaultOperator + "], can either be [OR] or [AND]"); } } return new QuerySourceBuilder().setQuery(queryBuilder); diff --git a/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java b/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java index 45b8ee267128d..e91567d8e3e2f 100644 --- a/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java +++ b/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; @@ -68,7 +68,7 @@ public Object compile(String script) { if (scriptFactory != null) { return scriptFactory; } - throw new ElasticsearchIllegalArgumentException("Native script [" + script + "] not found"); + throw new IllegalArgumentException("Native script [" + script + "] not found"); } @Override diff --git a/src/main/java/org/elasticsearch/script/Script.java b/src/main/java/org/elasticsearch/script/Script.java index 4e5e2027f9ba1..23cc02f529eed 100644 --- a/src/main/java/org/elasticsearch/script/Script.java +++ b/src/main/java/org/elasticsearch/script/Script.java @@ -21,7 +21,7 @@ import java.util.Map; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import static org.elasticsearch.script.ScriptService.ScriptType; @@ -46,10 +46,10 @@ public class Script { */ public Script(String lang, String script, ScriptType type, Map params) { if (script == null) { - throw new ElasticsearchIllegalArgumentException("The parameter script (String) must not be null in Script."); + throw new IllegalArgumentException("The parameter script (String) must not be null in Script."); } if (type == null) { - throw new ElasticsearchIllegalArgumentException("The parameter type (ScriptType) must not be null in Script."); + throw new IllegalArgumentException("The parameter type (ScriptType) must not be null in Script."); } this.lang = lang; diff --git a/src/main/java/org/elasticsearch/script/ScriptContext.java b/src/main/java/org/elasticsearch/script/ScriptContext.java index 18224e81483a5..7fbaaf8468430 100644 --- a/src/main/java/org/elasticsearch/script/ScriptContext.java +++ b/src/main/java/org/elasticsearch/script/ScriptContext.java @@ -19,7 +19,7 @@ package org.elasticsearch.script; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; /** @@ -75,10 +75,10 @@ final class Plugin implements ScriptContext { */ public Plugin(String pluginName, String operation) { if (Strings.hasLength(pluginName) == false) { - throw new ElasticsearchIllegalArgumentException("plugin name cannot be empty when registering a custom script context"); + throw new IllegalArgumentException("plugin name cannot be empty when registering a custom script context"); } if (Strings.hasLength(operation) == false) { - throw new ElasticsearchIllegalArgumentException("operation name cannot be empty when registering a custom script context"); + throw new IllegalArgumentException("operation name cannot be empty when registering a custom script context"); } this.pluginName = pluginName; this.operation = operation; diff --git a/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java b/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java index 40596870b9980..643a06ad4bf26 100644 --- a/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java +++ b/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.Map; @@ -46,7 +46,7 @@ public final class ScriptContextRegistry { validateScriptContext(customScriptContext); ScriptContext previousContext = scriptContexts.put(customScriptContext.getKey(), customScriptContext); if (previousContext != null) { - throw new ElasticsearchIllegalArgumentException("script context [" + customScriptContext.getKey() + "] cannot be registered twice"); + throw new IllegalArgumentException("script context [" + customScriptContext.getKey() + "] cannot be registered twice"); } } this.scriptContexts = ImmutableMap.copyOf(scriptContexts); @@ -69,10 +69,10 @@ boolean isSupportedContext(ScriptContext scriptContext) { //script contexts can be used in fine-grained settings, we need to be careful with what we allow here private void validateScriptContext(ScriptContext.Plugin scriptContext) { if (RESERVED_SCRIPT_CONTEXTS.contains(scriptContext.getPluginName())) { - throw new ElasticsearchIllegalArgumentException("[" + scriptContext.getPluginName() + "] is a reserved name, it cannot be registered as a custom script context"); + throw new IllegalArgumentException("[" + scriptContext.getPluginName() + "] is a reserved name, it cannot be registered as a custom script context"); } if (RESERVED_SCRIPT_CONTEXTS.contains(scriptContext.getOperation())) { - throw new ElasticsearchIllegalArgumentException("[" + scriptContext.getOperation() + "] is a reserved name, it cannot be registered as a custom script context"); + throw new IllegalArgumentException("[" + scriptContext.getOperation() + "] is a reserved name, it cannot be registered as a custom script context"); } } diff --git a/src/main/java/org/elasticsearch/script/ScriptMode.java b/src/main/java/org/elasticsearch/script/ScriptMode.java index 855690b794bc7..b7fb7474e7346 100644 --- a/src/main/java/org/elasticsearch/script/ScriptMode.java +++ b/src/main/java/org/elasticsearch/script/ScriptMode.java @@ -19,7 +19,7 @@ package org.elasticsearch.script; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import java.util.Locale; @@ -45,7 +45,7 @@ static ScriptMode parse(String input) { if (SANDBOX.toString().equals(input)) { return SANDBOX; } - throw new ElasticsearchIllegalArgumentException("script mode [" + input + "] not supported"); + throw new IllegalArgumentException("script mode [" + input + "] not supported"); } diff --git a/src/main/java/org/elasticsearch/script/ScriptModes.java b/src/main/java/org/elasticsearch/script/ScriptModes.java index 854a7ec2e40b9..36c3c457697ee 100644 --- a/src/main/java/org/elasticsearch/script/ScriptModes.java +++ b/src/main/java/org/elasticsearch/script/ScriptModes.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.ScriptService.ScriptType; @@ -159,7 +159,7 @@ public ScriptMode getScriptMode(String lang, ScriptType scriptType, ScriptContex } ScriptMode scriptMode = scriptModes.get(ENGINE_SETTINGS_PREFIX + "." + lang + "." + scriptType + "." + scriptContext.getKey()); if (scriptMode == null) { - throw new ElasticsearchIllegalArgumentException("script mode not found for lang [" + lang + "], script_type [" + scriptType + "], operation [" + scriptContext.getKey() + "]"); + throw new IllegalArgumentException("script mode not found for lang [" + lang + "], script_type [" + scriptType + "], operation [" + scriptContext.getKey() + "]"); } return scriptMode; } diff --git a/src/main/java/org/elasticsearch/script/ScriptModule.java b/src/main/java/org/elasticsearch/script/ScriptModule.java index a5a4707db0483..92f15cf2f6589 100644 --- a/src/main/java/org/elasticsearch/script/ScriptModule.java +++ b/src/main/java/org/elasticsearch/script/ScriptModule.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; import org.elasticsearch.common.inject.multibindings.Multibinder; @@ -82,7 +82,7 @@ protected void configure() { String name = entry.getKey(); Class type = entry.getValue().getAsClass("type", NativeScriptFactory.class); if (type == NativeScriptFactory.class) { - throw new ElasticsearchIllegalArgumentException("type is missing for native script [" + name + "]"); + throw new IllegalArgumentException("type is missing for native script [" + name + "]"); } scriptsBinder.addBinding(name).to(type).asEagerSingleton(); } diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java index cbe38f12958f2..53173e639ca2a 100644 --- a/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/src/main/java/org/elasticsearch/script/ScriptService.java @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; @@ -116,7 +116,7 @@ public ScriptService(Settings settings, Environment env, Setnull. + * @throws IllegalArgumentException if the given string doesn't match a sort mode or is null. */ public static MultiValueMode fromString(String sortMode) { try { return valueOf(sortMode.toUpperCase(Locale.ROOT)); } catch (Throwable t) { - throw new ElasticsearchIllegalArgumentException("Illegal sort_mode " + sortMode); + throw new IllegalArgumentException("Illegal sort_mode " + sortMode); } } @@ -615,7 +615,7 @@ public double get(int rootDoc) { } protected BytesRef pick(SortedBinaryDocValues values, BytesRef missingValue) { - throw new ElasticsearchIllegalArgumentException("Unsupported sort mode: " + this); + throw new IllegalArgumentException("Unsupported sort mode: " + this); } /** @@ -735,7 +735,7 @@ public BytesRef get(int rootDoc) { } protected int pick(RandomAccessOrds values) { - throw new ElasticsearchIllegalArgumentException("Unsupported sort mode: " + this); + throw new IllegalArgumentException("Unsupported sort mode: " + this); } /** diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java index d8d85deb0a386..dfbfb84e0fe05 100644 --- a/src/main/java/org/elasticsearch/search/SearchService.java +++ b/src/main/java/org/elasticsearch/search/SearchService.java @@ -29,7 +29,7 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.TopDocs; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.search.SearchType; @@ -230,7 +230,7 @@ public QuerySearchResult executeScan(ShardSearchRequest request) throws Elastics final int originalSize = context.size(); try { if (context.aggregations() != null) { - throw new ElasticsearchIllegalArgumentException("aggregations are not supported with search_type=scan"); + throw new IllegalArgumentException("aggregations are not supported with search_type=scan"); } if (context.scroll() == null) { diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java index 98cc7e39e1a3e..08c9cef997d9f 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java +++ b/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.aggregations; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.support.AggregationContext; import java.io.IOException; @@ -115,7 +115,7 @@ public static class Builder { public Builder add(AggregatorFactory factory) { if (!names.add(factory.name)) { - throw new ElasticsearchIllegalArgumentException("Two sibling aggregations cannot have the same name: [" + factory.name + "]"); + throw new IllegalArgumentException("Two sibling aggregations cannot have the same name: [" + factory.name + "]"); } factories.add(factory); return this; diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java index 7537878ae0429..091c1361634ff 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java +++ b/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java @@ -25,7 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -133,7 +133,7 @@ public Object getProperty(List path) { String aggName = path.get(0); InternalAggregation aggregation = get(aggName); if (aggregation == null) { - throw new ElasticsearchIllegalArgumentException("Cannot find an aggregation named [" + aggName + "]"); + throw new IllegalArgumentException("Cannot find an aggregation named [" + aggName + "]"); } return aggregation.getProperty(path.subList(1, path.size())); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java index 572680c931850..035db21d59d26 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import java.util.List; @@ -58,18 +58,18 @@ public Object getProperty(String containingAggName, List path) { String aggName = path.get(0); if (aggName.equals("_count")) { if (path.size() > 1) { - throw new ElasticsearchIllegalArgumentException("_count must be the last element in the path"); + throw new IllegalArgumentException("_count must be the last element in the path"); } return getDocCount(); } else if (aggName.equals("_key")) { if (path.size() > 1) { - throw new ElasticsearchIllegalArgumentException("_key must be the last element in the path"); + throw new IllegalArgumentException("_key must be the last element in the path"); } return getKey(); } InternalAggregation aggregation = aggregations.get(aggName); if (aggregation == null) { - throw new ElasticsearchIllegalArgumentException("Cannot find an aggregation named [" + aggName + "] in [" + containingAggName + "]"); + throw new IllegalArgumentException("Cannot find an aggregation named [" + aggName + "] in [" + containingAggName + "]"); } return aggregation.getProperty(path.subList(1, path.size())); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index f0c0294b4d7e1..f4e2c169c9c7b 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.LongHash; @@ -71,7 +71,7 @@ public BestBucketsDeferringCollector() { @Override public boolean needsScores() { if (collector == null) { - throw new ElasticsearchIllegalStateException(); + throw new IllegalStateException(); } return collector.needsScores(); } @@ -127,10 +127,10 @@ public void postCollection() throws IOException { @Override public void prepareSelectedBuckets(long... selectedBuckets) throws IOException { if (!finished) { - throw new ElasticsearchIllegalStateException("Cannot replay yet, collection is not finished: postCollect() has not been called"); + throw new IllegalStateException("Cannot replay yet, collection is not finished: postCollect() has not been called"); } if (this.selectedBuckets != null) { - throw new ElasticsearchIllegalStateException("Already been replayed"); + throw new IllegalStateException("Already been replayed"); } final LongHash hash = new LongHash(selectedBuckets.length, BigArrays.NON_RECYCLING_INSTANCE); @@ -141,7 +141,7 @@ public void prepareSelectedBuckets(long... selectedBuckets) throws IOException { collector.preCollection(); if (collector.needsScores()) { - throw new ElasticsearchIllegalStateException("Cannot defer if scores are needed"); + throw new IllegalStateException("Cannot defer if scores are needed"); } for (Entry entry : entries) { @@ -176,11 +176,11 @@ public Aggregator wrap(final Aggregator in) { @Override public InternalAggregation buildAggregation(long bucket) throws IOException { if (selectedBuckets == null) { - throw new ElasticsearchIllegalStateException("Collection has not been replayed yet."); + throw new IllegalStateException("Collection has not been replayed yet."); } final long rebasedBucket = selectedBuckets.find(bucket); if (rebasedBucket == -1) { - throw new ElasticsearchIllegalStateException("Cannot build for a bucket which has not been collected"); + throw new IllegalStateException("Cannot build for a bucket which has not been collected"); } return in.buildAggregation(rebasedBucket); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java index 437e642d7e630..51b7e968f0f78 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.search.TopScoreDocCollector; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.BucketCollector; import org.elasticsearch.search.aggregations.LeafBucketCollector; @@ -122,10 +122,10 @@ public void postCollection() throws IOException { @Override public void prepareSelectedBuckets(long... selectedBuckets) throws IOException { if (!finished) { - throw new ElasticsearchIllegalStateException("Cannot replay yet, collection is not finished: postCollect() has not been called"); + throw new IllegalStateException("Cannot replay yet, collection is not finished: postCollect() has not been called"); } if (selectedBuckets.length > 1) { - throw new ElasticsearchIllegalStateException("Collection only supported on a single bucket"); + throw new IllegalStateException("Collection only supported on a single bucket"); } deferred.preCollection(); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java index b0f2693e9eb34..9f0ce6c3c339a 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.BucketCollector; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -110,19 +110,19 @@ public InternalAggregation buildEmptyAggregation() { @Override public LeafBucketCollector getLeafCollector(LeafReaderContext ctx) throws IOException { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( "Deferred collectors cannot be collected directly. They must be collected through the recording wrapper."); } @Override public void preCollection() throws IOException { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( "Deferred collectors cannot be collected directly. They must be collected through the recording wrapper."); } @Override public void postCollection() throws IOException { - throw new ElasticsearchIllegalStateException( + throw new IllegalStateException( "Deferred collectors cannot be collected directly. They must be collected through the recording wrapper."); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java index f278be9f663f3..a212d107083c4 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.aggregations.bucket; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -89,13 +89,13 @@ public Object getProperty(List path) { String aggName = path.get(0); if (aggName.equals("_count")) { if (path.size() > 1) { - throw new ElasticsearchIllegalArgumentException("_count must be the last element in the path"); + throw new IllegalArgumentException("_count must be the last element in the path"); } return getDocCount(); } InternalAggregation aggregation = aggregations.get(aggName); if (aggregation == null) { - throw new ElasticsearchIllegalArgumentException("Cannot find an aggregation named [" + aggName + "] in [" + getName() + "]"); + throw new IllegalArgumentException("Cannot find an aggregation named [" + aggName + "] in [" + getName() + "]"); } return aggregation.getProperty(path.subList(1, path.size())); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java index 40db0d054c17a..0c70f787247a8 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.util.LongArray; @@ -93,7 +93,7 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, return LeafBucketCollector.NO_OP_COLLECTOR; } if (replay == null) { - throw new ElasticsearchIllegalStateException(); + throw new IllegalStateException(); } final SortedDocValues globalOrdinals = valuesSource.globalOrdinalsValues(parentType, ctx); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java index f2c058a8e1cfe..557b6b85971ab 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.aggregations.bucket.geogrid; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; @@ -56,7 +56,7 @@ public GeoHashGridBuilder field(String field) { */ public GeoHashGridBuilder precision(int precision) { if ((precision < 1) || (precision > 12)) { - throw new ElasticsearchIllegalArgumentException("Invalid geohash aggregation precision of " + precision + throw new IllegalArgumentException("Invalid geohash aggregation precision of " + precision + "must be between 1 and 12"); } this.precision = precision; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java index 7862eade5d6ff..36b32d08d39dd 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket.global; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; @@ -78,7 +78,7 @@ public Aggregator createInternal(AggregationContext context, Aggregator parent, "sub-aggregation [" + name + "]. Global aggregations can only be defined as top level aggregations"); } if (collectsFromSingleBucket == false) { - throw new ElasticsearchIllegalStateException(); + throw new IllegalStateException(); } return new GlobalAggregator(name, factories, context, metaData); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java index 491422d20cf56..fb1d2973201c3 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.PriorityQueue; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -68,7 +68,7 @@ public InternalHistogram readResult(StreamInput in) throws IOException { public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Factory factory = (Factory) context.attributes().get("factory"); if (factory == null) { - throw new ElasticsearchIllegalStateException("No factory found for histogram buckets"); + throw new IllegalStateException("No factory found for histogram buckets"); } Bucket histogram = new Bucket(context.keyed(), context.formatter(), factory); histogram.readFrom(in); @@ -461,7 +461,7 @@ private static Factory resolveFactory(St } else if (factoryType.equals(TYPE.name())) { return new Factory<>(); } else { - throw new ElasticsearchIllegalStateException("Invalid histogram factory type [" + factoryType + "]"); + throw new IllegalStateException("Invalid histogram factory type [" + factoryType + "]"); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java index c74df049d120a..5a65715468496 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; @@ -103,7 +103,7 @@ public long get(int doc) { values.setDocument(doc); final int valuesCount = values.count(); if (valuesCount > 1) { - throw new ElasticsearchIllegalArgumentException("Sample diversifying key must be a single valued-field"); + throw new IllegalArgumentException("Sample diversifying key must be a single valued-field"); } if (valuesCount == 1) { final BytesRef bytes = values.valueAt(0); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java index bf196245ce130..3f967400d9b55 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BytesRefHash; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; @@ -110,7 +110,7 @@ public long get(int doc) { values.setDocument(doc); final int valuesCount = values.count(); if (valuesCount > 1) { - throw new ElasticsearchIllegalArgumentException("Sample diversifying key must be a single valued-field"); + throw new IllegalArgumentException("Sample diversifying key must be a single valued-field"); } if (valuesCount == 1) { final BytesRef bytes = values.valueAt(0); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java index e5f963ed3ef5d..750b674026039 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.DiversifiedTopDocsCollector.ScoreDocKey; import org.apache.lucene.search.TopDocsCollector; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.bucket.BestDocsDeferringCollector; @@ -94,7 +94,7 @@ public long get(int doc) { values.setDocument(doc); final int valuesCount = values.count(); if (valuesCount > 1) { - throw new ElasticsearchIllegalArgumentException("Sample diversifying key must be a single valued-field"); + throw new IllegalArgumentException("Sample diversifying key must be a single valued-field"); } if (valuesCount == 1) { return values.valueAt(0); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java index 808acc49883c7..6986fef258736 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.DiversifiedTopDocsCollector; import org.apache.lucene.search.DiversifiedTopDocsCollector.ScoreDocKey; import org.apache.lucene.search.TopDocsCollector; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.bucket.BestDocsDeferringCollector; @@ -100,7 +100,7 @@ public long get(int doc) { globalOrds.setDocument(doc); final long valuesCount = globalOrds.cardinality(); if (valuesCount > 1) { - throw new ElasticsearchIllegalArgumentException("Sample diversifying key must be a single valued-field"); + throw new IllegalArgumentException("Sample diversifying key must be a single valued-field"); } if (valuesCount == 1) { long result = globalOrds.ordAt(0); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java index 27bfc8666c588..87897b12e8f79 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket.sampler; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; @@ -109,7 +109,7 @@ public static ExecutionMode fromString(String value) { return mode; } } - throw new ElasticsearchIllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); + throw new IllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); } private final ParseField parseField; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java index ef837cfab8222..adf97c5a65ec3 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.index.FilterableTermsEnum; @@ -32,7 +32,6 @@ import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; -import org.elasticsearch.search.aggregations.AggregatorBase; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.NonCollectingAggregator; @@ -100,7 +99,7 @@ public static ExecutionMode fromString(String value) { return mode; } } - throw new ElasticsearchIllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); + throw new IllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); } private final ParseField parseField; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java index 48d70c0f9c20a..be5de56ec4a89 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket.significant; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.FilterBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; @@ -133,7 +133,7 @@ public SignificantTermsBuilder include(String regex) { */ public SignificantTermsBuilder include(String regex, int flags) { if (includeTerms != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); } this.includePattern = regex; this.includeFlags = flags; @@ -145,7 +145,7 @@ public SignificantTermsBuilder include(String regex, int flags) { */ public SignificantTermsBuilder include(String [] terms) { if (includePattern != null) { - throw new ElasticsearchIllegalArgumentException("include clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("include clause must be an array of exact values or a regex, not both"); } this.includeTerms = terms; return this; @@ -156,7 +156,7 @@ public SignificantTermsBuilder include(String [] terms) { */ public SignificantTermsBuilder include(long [] terms) { if (includePattern != null) { - throw new ElasticsearchIllegalArgumentException("include clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("include clause must be an array of exact values or a regex, not both"); } this.includeTerms = longsArrToStringArr(terms); return this; @@ -189,7 +189,7 @@ public SignificantTermsBuilder exclude(String regex) { */ public SignificantTermsBuilder exclude(String regex, int flags) { if (excludeTerms != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); } this.excludePattern = regex; this.excludeFlags = flags; @@ -201,7 +201,7 @@ public SignificantTermsBuilder exclude(String regex, int flags) { */ public SignificantTermsBuilder exclude(String [] terms) { if (excludePattern != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); } this.excludeTerms = terms; return this; @@ -213,7 +213,7 @@ public SignificantTermsBuilder exclude(String [] terms) { */ public SignificantTermsBuilder exclude(long [] terms) { if (excludePattern != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of longs or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of longs or a regex, not both"); } this.excludeTerms = longsArrToStringArr(terms); return this; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java index b7fb56c4ac178..6c3753190b118 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.aggregations.bucket.significant.heuristics; -import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java index 8b158117384c9..c50893877ded1 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.aggregations.bucket.significant.heuristics; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamOutput; @@ -124,13 +124,13 @@ protected void checkFrequencies(long subsetFreq, long subsetSize, long supersetF checkFrequencyValidity(subsetFreq, subsetSize, supersetFreq, supersetSize, scoreFunctionName); if (backgroundIsSuperset) { if (subsetFreq > supersetFreq) { - throw new ElasticsearchIllegalArgumentException("subsetFreq > supersetFreq" + SCORE_ERROR_MESSAGE); + throw new IllegalArgumentException("subsetFreq > supersetFreq" + SCORE_ERROR_MESSAGE); } if (subsetSize > supersetSize) { - throw new ElasticsearchIllegalArgumentException("subsetSize > supersetSize" + SCORE_ERROR_MESSAGE); + throw new IllegalArgumentException("subsetSize > supersetSize" + SCORE_ERROR_MESSAGE); } if (supersetFreq - subsetFreq > supersetSize - subsetSize) { - throw new ElasticsearchIllegalArgumentException("supersetFreq - subsetFreq > supersetSize - subsetSize" + SCORE_ERROR_MESSAGE); + throw new IllegalArgumentException("supersetFreq - subsetFreq > supersetSize - subsetSize" + SCORE_ERROR_MESSAGE); } } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java index b3da709323b32..f57b1d5ba783a 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.aggregations.bucket.significant.heuristics; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -40,13 +40,13 @@ public abstract class SignificanceHeuristic { protected void checkFrequencyValidity(long subsetFreq, long subsetSize, long supersetFreq, long supersetSize, String scoreFunctionName) { if (subsetFreq < 0 || subsetSize < 0 || supersetFreq < 0 || supersetSize < 0) { - throw new ElasticsearchIllegalArgumentException("Frequencies of subset and superset must be positive in " + scoreFunctionName + ".getScore()"); + throw new IllegalArgumentException("Frequencies of subset and superset must be positive in " + scoreFunctionName + ".getScore()"); } if (subsetFreq > subsetSize) { - throw new ElasticsearchIllegalArgumentException("subsetFreq > subsetSize, in " + scoreFunctionName); + throw new IllegalArgumentException("subsetFreq > subsetSize, in " + scoreFunctionName); } if (supersetFreq > supersetSize) { - throw new ElasticsearchIllegalArgumentException("supersetFreq > supersetSize, in " + scoreFunctionName); + throw new IllegalArgumentException("supersetFreq > supersetSize, in " + scoreFunctionName); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java index ff7cf1ab78dd9..93985a39d224b 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java @@ -22,7 +22,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.ToXContent; @@ -78,7 +78,7 @@ public long getDocCount() { @Override public long getDocCountError() { if (!showDocCountError) { - throw new ElasticsearchIllegalStateException("show_terms_doc_count_error is false"); + throw new IllegalStateException("show_terms_doc_count_error is false"); } return docCountError; } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java index 3fa99d2b7fd24..3d6c47b63b812 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java @@ -19,12 +19,11 @@ package org.elasticsearch.search.aggregations.bucket.terms; import org.apache.lucene.search.IndexSearcher; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; -import org.elasticsearch.search.aggregations.AggregatorBase; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.NonCollectingAggregator; @@ -115,7 +114,7 @@ public static ExecutionMode fromString(String value) { return mode; } } - throw new ElasticsearchIllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); + throw new IllegalArgumentException("Unknown `execution_hint`: [" + value + "], expected any of " + values()); } private final ParseField parseField; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java index ea2e40587d456..adf05d96baeb4 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.aggregations.bucket.terms; import org.apache.lucene.util.automaton.RegExp; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.ValuesSourceAggregationBuilder; @@ -93,7 +93,7 @@ public TermsBuilder shardMinDocCount(long shardMinDocCount) { */ public TermsBuilder include(String regex) { if (includeTerms != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of strings or a regex, not both"); } this.includePattern = regex; return this; @@ -104,7 +104,7 @@ public TermsBuilder include(String regex) { */ public TermsBuilder include(String [] terms) { if (includePattern != null) { - throw new ElasticsearchIllegalArgumentException("include clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("include clause must be an array of exact values or a regex, not both"); } this.includeTerms = terms; return this; @@ -115,7 +115,7 @@ public TermsBuilder include(String [] terms) { */ public TermsBuilder include(long [] terms) { if (includePattern != null) { - throw new ElasticsearchIllegalArgumentException("include clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("include clause must be an array of exact values or a regex, not both"); } this.includeTerms = longsArrToStringArr(terms); return this; @@ -135,7 +135,7 @@ private String[] longsArrToStringArr(long[] terms) { */ public TermsBuilder include(double [] terms) { if (includePattern != null) { - throw new ElasticsearchIllegalArgumentException("include clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("include clause must be an array of exact values or a regex, not both"); } this.includeTerms = doubleArrToStringArr(terms); return this; @@ -157,7 +157,7 @@ private String[] doubleArrToStringArr(double[] terms) { */ public TermsBuilder exclude(String regex) { if (excludeTerms != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); } this.excludePattern = regex; return this; @@ -168,7 +168,7 @@ public TermsBuilder exclude(String regex) { */ public TermsBuilder exclude(String [] terms) { if (excludePattern != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); } this.excludeTerms = terms; return this; @@ -180,7 +180,7 @@ public TermsBuilder exclude(String [] terms) { */ public TermsBuilder exclude(long [] terms) { if (excludePattern != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); } this.excludeTerms = longsArrToStringArr(terms); return this; @@ -191,7 +191,7 @@ public TermsBuilder exclude(long [] terms) { */ public TermsBuilder exclude(double [] terms) { if (excludePattern != null) { - throw new ElasticsearchIllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); + throw new IllegalArgumentException("exclude clause must be an array of exact values or a regex, not both"); } this.excludeTerms = doubleArrToStringArr(terms); return this; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java index cb1fc48be0075..6f92bb85970cc 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.support.ValuesSource; @@ -293,7 +293,7 @@ public IncludeExclude includeExclude() { RegExp excludePattern = exclude != null ? new RegExp(exclude) : null; if (includePattern != null || excludePattern != null) { if (includeValues != null || excludeValues != null) { - throw new ElasticsearchIllegalArgumentException("Can only use regular expression include/exclude or a set of values, not both"); + throw new IllegalArgumentException("Can only use regular expression include/exclude or a set of values, not both"); } return new IncludeExclude(includePattern, excludePattern); } else if (includeValues != null || excludeValues != null) { diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java index 2f94c38d46427..e6659358b6430 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.aggregations.metrics; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.support.format.ValueFormatter; import java.util.List; @@ -55,7 +55,7 @@ public Object getProperty(List path) { } else if (path.size() == 1 && "value".equals(path.get(0))) { return value(); } else { - throw new ElasticsearchIllegalArgumentException("path not supported for [" + getName() + "]: " + path); + throw new IllegalArgumentException("path not supported for [" + getName() + "]: " + path); } } @@ -86,7 +86,7 @@ public Object getProperty(List path) { } else if (path.size() == 1) { return value(path.get(0)); } else { - throw new ElasticsearchIllegalArgumentException("path not supported for [" + getName() + "]: " + path); + throw new IllegalArgumentException("path not supported for [" + getName() + "]: " + path); } } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java index a59abe1ad2b1b..972ab7eacd539 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics.geobounds; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -123,7 +123,7 @@ public Object getProperty(List path) { case "right": return boundingBox.bottomRight.lon(); default: - throw new ElasticsearchIllegalArgumentException("Found unknown path element [" + bBoxSide + "] in [" + getName() + "]"); + throw new IllegalArgumentException("Found unknown path element [" + bBoxSide + "] in [" + getName() + "]"); } } else if (path.size() == 2) { BoundingBox boundingBox = resolveBoundingBox(); @@ -137,7 +137,7 @@ public Object getProperty(List path) { cornerPoint = boundingBox.bottomRight; break; default: - throw new ElasticsearchIllegalArgumentException("Found unknown path element [" + cornerString + "] in [" + getName() + "]"); + throw new IllegalArgumentException("Found unknown path element [" + cornerString + "] in [" + getName() + "]"); } String latLonString = path.get(1); switch (latLonString) { @@ -146,10 +146,10 @@ public Object getProperty(List path) { case "lon": return cornerPoint.lon(); default: - throw new ElasticsearchIllegalArgumentException("Found unknown path element [" + latLonString + "] in [" + getName() + "]"); + throw new IllegalArgumentException("Found unknown path element [" + latLonString + "] in [" + getName() + "]"); } } else { - throw new ElasticsearchIllegalArgumentException("path not supported for [" + getName() + "]: " + path); + throw new IllegalArgumentException("path not supported for [" + getName() + "]: " + path); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java index b4916cdd8c9ae..31bc8d8ac279f 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics.percentiles; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -80,7 +80,7 @@ protected void doReadFrom(StreamInput in) throws IOException { if (in.getVersion().before(Version.V_1_2_0)) { final byte id = in.readByte(); if (id != 0) { - throw new ElasticsearchIllegalArgumentException("Unexpected percentiles aggregator id [" + id + "]"); + throw new IllegalArgumentException("Unexpected percentiles aggregator id [" + id + "]"); } } keys = new double[in.readInt()]; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java index 877b632dbdb08..d1508174a64e0 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics.scripted; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -122,7 +122,7 @@ public Object getProperty(List path) { } else if (path.size() == 1 && "value".equals(path.get(0))) { return aggregation; } else { - throw new ElasticsearchIllegalArgumentException("path not supported for [" + getName() + "]: " + path); + throw new IllegalArgumentException("path not supported for [" + getName() + "]: " + path); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java index 8f431578fef5f..d0af5fa671b5b 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics.stats; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BigArrays; @@ -135,7 +135,7 @@ public double metric(String name, long owningBucketOrd) { case max: return valuesSource == null ? Double.NEGATIVE_INFINITY : maxes.get(owningBucketOrd); case avg: return valuesSource == null ? Double.NaN : sums.get(owningBucketOrd) / counts.get(owningBucketOrd); default: - throw new ElasticsearchIllegalArgumentException("Unknown value [" + name + "] in common stats aggregation"); + throw new IllegalArgumentException("Unknown value [" + name + "] in common stats aggregation"); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java index 75dc354f8745b..b5863d8e35261 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics.stats.extended; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BigArrays; @@ -154,7 +154,7 @@ public double metric(String name, long owningBucketOrd) { if (valuesSource == null) { return Double.NaN; } return (sums.get(owningBucketOrd) / counts.get(owningBucketOrd)) - (Math.sqrt(variance(owningBucketOrd)) * this.sigma); default: - throw new ElasticsearchIllegalArgumentException("Unknown value [" + name + "] in common stats aggregation"); + throw new IllegalArgumentException("Unknown value [" + name + "] in common stats aggregation"); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java index b33f8bb092e9c..9bc2b42f2a548 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopFieldDocs; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -132,7 +132,7 @@ public Object getProperty(List path) { if (path.isEmpty()) { return this; } else { - throw new ElasticsearchIllegalArgumentException("path not supported for [" + getName() + "]: " + path); + throw new IllegalArgumentException("path not supported for [" + getName() + "]: " + path); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java index 6dae0975d910c..db4b9590036f8 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java +++ b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.support; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationExecutionException; @@ -158,7 +158,7 @@ public String toString() { public AggregationPath(List tokens) { this.pathElements = tokens; if (tokens == null || tokens.size() == 0) { - throw new ElasticsearchIllegalArgumentException("Invalid path [" + this + "]"); + throw new IllegalArgumentException("Invalid path [" + this + "]"); } } @@ -206,13 +206,13 @@ public double resolveValue(HasAggregations root) { Aggregation agg = parent.getAggregations().get(token.name); if (agg == null) { - throw new ElasticsearchIllegalArgumentException("Invalid order path [" + this + + throw new IllegalArgumentException("Invalid order path [" + this + "]. Cannot find aggregation named [" + token.name + "]"); } if (agg instanceof SingleBucketAggregation) { if (token.key != null && !token.key.equals("doc_count")) { - throw new ElasticsearchIllegalArgumentException("Invalid order path [" + this + + throw new IllegalArgumentException("Invalid order path [" + this + "]. Unknown value key [" + token.key + "] for single-bucket aggregation [" + token.name + "]. Either use [doc_count] as key or drop the key all together"); } @@ -223,13 +223,13 @@ public double resolveValue(HasAggregations root) { // the agg can only be a metrics agg, and a metrics agg must be at the end of the path if (i != pathElements.size() - 1) { - throw new ElasticsearchIllegalArgumentException("Invalid order path [" + this + + throw new IllegalArgumentException("Invalid order path [" + this + "]. Metrics aggregations cannot have sub-aggregations (at [" + token + ">" + pathElements.get(i + 1) + "]"); } if (agg instanceof InternalNumericMetricsAggregation.SingleValue) { if (token.key != null && !token.key.equals("value")) { - throw new ElasticsearchIllegalArgumentException("Invalid order path [" + this + + throw new IllegalArgumentException("Invalid order path [" + this + "]. Unknown value key [" + token.key + "] for single-value metric aggregation [" + token.name + "]. Either use [value] as key or drop the key all together"); } @@ -240,7 +240,7 @@ public double resolveValue(HasAggregations root) { // we're left with a multi-value metric agg if (token.key == null) { - throw new ElasticsearchIllegalArgumentException("Invalid order path [" + this + + throw new IllegalArgumentException("Invalid order path [" + this + "]. Missing value key in [" + token + "] which refers to a multi-value metric aggregation"); } parent = null; diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java index 55176b7c7fc11..7f42d0b684e72 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java +++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.aggregations.support.format; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -39,7 +39,7 @@ public static ValueFormatter read(StreamInput in) throws IOException { case ValueFormatter.Number.Pattern.ID: formatter = new ValueFormatter.Number.Pattern(); break; case ValueFormatter.GeoHash.ID: formatter = ValueFormatter.GEOHASH; break; case ValueFormatter.BooleanFormatter.ID: formatter = ValueFormatter.BOOLEAN; break; - default: throw new ElasticsearchIllegalArgumentException("Unknown value formatter with id [" + id + "]"); + default: throw new IllegalArgumentException("Unknown value formatter with id [" + id + "]"); } formatter.readFrom(in); return formatter; diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 61132aa28abfb..b77f86432ca8b 100644 --- a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchGenerationException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; @@ -316,7 +316,7 @@ public SearchSourceBuilder timeout(String timeout) { */ public SearchSourceBuilder terminateAfter(int terminateAfter) { if (terminateAfter <= 0) { - throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0"); + throw new IllegalArgumentException("terminateAfter must be > 0"); } this.terminateAfter = terminateAfter; return this; diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java index 5e44f4c49143a..b02ce1584a101 100644 --- a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java @@ -28,8 +28,8 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.BitDocIdSet; import org.apache.lucene.util.BitSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; @@ -147,7 +147,7 @@ public void execute(SearchContext context) { if (x == null) { // Only fail if we know it is a object field, missing paths / fields shouldn't fail. if (context.smartNameObjectMapper(fieldName) != null) { - throw new ElasticsearchIllegalArgumentException("field [" + fieldName + "] isn't a leaf field"); + throw new IllegalArgumentException("field [" + fieldName + "] isn't a leaf field"); } } else if (x.mapper().fieldType().stored()) { if (fieldNames == null) { @@ -313,7 +313,7 @@ private InternalSearchHit createNestedSearchHit(SearchContext context, int neste // nested field has an object value in the _source. This just means the nested field has just one inner object, which is valid, but uncommon. nestedParsedSource = ImmutableList.of((Map < String, Object >) extractedValue); } else { - throw new ElasticsearchIllegalStateException("extracted source isn't an object or an array"); + throw new IllegalStateException("extracted source isn't an object or an array"); } sourceAsMap = nestedParsedSource.get(nested.getOffset()); nested = nested.getChild(); diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java index c35398152dc0e..7951e52bc1898 100644 --- a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java +++ b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.fetch.fielddata; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; @@ -47,7 +47,7 @@ public void parse(XContentParser parser, SearchContext context) throws Exception String fieldName = parser.text(); context.fieldDataFields().add(new FieldDataFieldsContext.FieldDataField(fieldName)); } else { - throw new ElasticsearchIllegalStateException("Expected either a VALUE_STRING or an START_ARRAY but got " + token); + throw new IllegalStateException("Expected either a VALUE_STRING or an START_ARRAY but got " + token); } } } diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java index f282439b73351..931a00df7d56c 100644 --- a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java +++ b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperService; @@ -74,12 +74,12 @@ private Map parseInnerHits(XContentParse Map innerHitsMap = null; while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token != XContentParser.Token.FIELD_NAME) { - throw new ElasticsearchIllegalArgumentException("Unexpected token " + token + " in [inner_hits]: inner_hit definitions must start with the name of the inner_hit."); + throw new IllegalArgumentException("Unexpected token " + token + " in [inner_hits]: inner_hit definitions must start with the name of the inner_hit."); } final String innerHitName = parser.currentName(); token = parser.nextToken(); if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); + throw new IllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); } InnerHitsContext.BaseInnerHits innerHits = parseInnerHit(parser, parseContext, searchContext, innerHitName); if (innerHitsMap == null) { @@ -93,12 +93,12 @@ private Map parseInnerHits(XContentParse private InnerHitsContext.BaseInnerHits parseInnerHit(XContentParser parser, QueryParseContext parseContext, SearchContext searchContext, String innerHitName) throws Exception { XContentParser.Token token = parser.nextToken(); if (token != XContentParser.Token.FIELD_NAME) { - throw new ElasticsearchIllegalArgumentException("Unexpected token " + token + " inside inner hit definition. Either specify [path] or [type] object"); + throw new IllegalArgumentException("Unexpected token " + token + " inside inner hit definition. Either specify [path] or [type] object"); } String fieldName = parser.currentName(); token = parser.nextToken(); if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); + throw new IllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); } String nestedPath = null; @@ -111,16 +111,16 @@ private InnerHitsContext.BaseInnerHits parseInnerHit(XContentParser parser, Quer type = parser.currentName(); break; default: - throw new ElasticsearchIllegalArgumentException("Either path or type object must be defined"); + throw new IllegalArgumentException("Either path or type object must be defined"); } token = parser.nextToken(); if (token != XContentParser.Token.FIELD_NAME) { - throw new ElasticsearchIllegalArgumentException("Unexpected token " + token + " inside inner hit definition. Either specify [path] or [type] object"); + throw new IllegalArgumentException("Unexpected token " + token + " inside inner hit definition. Either specify [path] or [type] object"); } fieldName = parser.currentName(); token = parser.nextToken(); if (token != XContentParser.Token.START_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); + throw new IllegalArgumentException("Inner hit definition for [" + innerHitName + " starts with a [" + token + "], expected a [" + XContentParser.Token.START_OBJECT + "]."); } final InnerHitsContext.BaseInnerHits innerHits; @@ -129,17 +129,17 @@ private InnerHitsContext.BaseInnerHits parseInnerHit(XContentParser parser, Quer } else if (type != null) { innerHits = parseParentChild(parser, parseContext, searchContext, fieldName); } else { - throw new ElasticsearchIllegalArgumentException("Either [path] or [type] must be defined"); + throw new IllegalArgumentException("Either [path] or [type] must be defined"); } // Completely consume all json objects: token = parser.nextToken(); if (token != XContentParser.Token.END_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Expected [" + XContentParser.Token.END_OBJECT + "] token, but got a [" + token + "] token."); + throw new IllegalArgumentException("Expected [" + XContentParser.Token.END_OBJECT + "] token, but got a [" + token + "] token."); } token = parser.nextToken(); if (token != XContentParser.Token.END_OBJECT) { - throw new ElasticsearchIllegalArgumentException("Expected [" + XContentParser.Token.END_OBJECT + "] token, but got a [" + token + "] token."); + throw new IllegalArgumentException("Expected [" + XContentParser.Token.END_OBJECT + "] token, but got a [" + token + "] token."); } return innerHits; @@ -149,7 +149,7 @@ private InnerHitsContext.ParentChildInnerHits parseParentChild(XContentParser pa ParseResult parseResult = parseSubSearchContext(searchContext, parseContext, parser); DocumentMapper documentMapper = searchContext.mapperService().documentMapper(type); if (documentMapper == null) { - throw new ElasticsearchIllegalArgumentException("type [" + type + "] doesn't exist"); + throw new IllegalArgumentException("type [" + type + "] doesn't exist"); } return new InnerHitsContext.ParentChildInnerHits(parseResult.context(), parseResult.query(), parseResult.childInnerHits(), documentMapper); } @@ -157,11 +157,11 @@ private InnerHitsContext.ParentChildInnerHits parseParentChild(XContentParser pa private InnerHitsContext.NestedInnerHits parseNested(XContentParser parser, QueryParseContext parseContext, SearchContext searchContext, String nestedPath) throws Exception { MapperService.SmartNameObjectMapper smartNameObjectMapper = searchContext.smartNameObjectMapper(nestedPath); if (smartNameObjectMapper == null || !smartNameObjectMapper.hasMapper()) { - throw new ElasticsearchIllegalArgumentException("path [" + nestedPath +"] doesn't exist"); + throw new IllegalArgumentException("path [" + nestedPath +"] doesn't exist"); } ObjectMapper childObjectMapper = smartNameObjectMapper.mapper(); if (!childObjectMapper.nested().isNested()) { - throw new ElasticsearchIllegalArgumentException("path [" + nestedPath +"] isn't nested"); + throw new IllegalArgumentException("path [" + nestedPath +"] isn't nested"); } ObjectMapper parentObjectMapper = parseContext.nestedScope().nextLevel(childObjectMapper); ParseResult parseResult = parseSubSearchContext(searchContext, parseContext, parser); diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java index fcfe3a9994667..b43cf006a60bb 100644 --- a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.search.SearchHitField; @@ -77,7 +77,7 @@ public void hitExecute(SearchContext context, HitContext hitContext) throws Elas try { leafScript = scriptField.script().getLeafSearchScript(hitContext.readerContext()); } catch (IOException e1) { - throw new ElasticsearchIllegalStateException("Failed to load script", e1); + throw new IllegalStateException("Failed to load script", e1); } leafScript.setDocument(hitContext.docId()); diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java index 6d34c7a58ee4d..5a6a934d18493 100644 --- a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.highlight.Encoder; import org.apache.lucene.search.vectorhighlight.*; import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.StringText; @@ -65,7 +65,7 @@ public HighlightField highlight(HighlighterContext highlighterContext) { FieldMapper mapper = highlighterContext.mapper; if (!(mapper.fieldType().storeTermVectors() && mapper.fieldType().storeTermVectorOffsets() && mapper.fieldType().storeTermVectorPositions())) { - throw new ElasticsearchIllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with term vector with position offsets to be used with fast vector highlighter"); + throw new IllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with term vector with position offsets to be used with fast vector highlighter"); } Encoder encoder = field.fieldOptions().encoder().equals("html") ? HighlightUtils.Encoders.HTML : HighlightUtils.Encoders.DEFAULT; diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java index 042146addca02..a80357a18f410 100644 --- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java +++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java @@ -23,14 +23,13 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.internal.SourceFieldMapper; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.fetch.FetchSubPhase; @@ -89,7 +88,7 @@ public void hitExecute(SearchContext context, HitContext hitContext) throws Elas if (context.highlight().forceSource(field)) { SourceFieldMapper sourceFieldMapper = context.mapperService().documentMapper(hitContext.hit().type()).sourceMapper(); if (!sourceFieldMapper.enabled()) { - throw new ElasticsearchIllegalArgumentException("source is forced for fields " + fieldNamesToHighlight + " but type [" + hitContext.hit().type() + "] has disabled _source"); + throw new IllegalArgumentException("source is forced for fields " + fieldNamesToHighlight + " but type [" + hitContext.hit().type() + "] has disabled _source"); } } @@ -113,7 +112,7 @@ public void hitExecute(SearchContext context, HitContext hitContext) throws Elas Highlighter highlighter = highlighters.get(highlighterType); if (highlighter == null) { - throw new ElasticsearchIllegalArgumentException("unknown highlighter type [" + highlighterType + "] for the field [" + fieldName + "]"); + throw new IllegalArgumentException("unknown highlighter type [" + highlighterType + "] for the field [" + fieldName + "]"); } HighlighterContext.HighlightQuery highlightQuery; diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java b/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java index 24adef3bba586..d05c35988e876 100644 --- a/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java +++ b/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java @@ -22,7 +22,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.lucene.search.vectorhighlight.SimpleBoundaryScanner; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.IndexQueryParserService; @@ -70,7 +70,7 @@ public class HighlighterParseElement implements SearchParseElement { public void parse(XContentParser parser, SearchContext context) throws Exception { try { context.highlight(parse(parser, context.queryParserService())); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { throw new SearchParseException(context, "Error while trying to parse Highlighter element in request"); } } @@ -110,7 +110,7 @@ public SearchContextHighlight parse(XContentParser parser, IndexQueryParserServi while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token == XContentParser.Token.FIELD_NAME) { if (highlightFieldName != null) { - throw new ElasticsearchIllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field"); + throw new IllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field"); } highlightFieldName = parser.currentName(); } else if (token == XContentParser.Token.START_OBJECT) { @@ -118,7 +118,7 @@ public SearchContextHighlight parse(XContentParser parser, IndexQueryParserServi } } } else { - throw new ElasticsearchIllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field"); + throw new IllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field"); } } } @@ -181,7 +181,7 @@ public SearchContextHighlight parse(XContentParser parser, IndexQueryParserServi final SearchContextHighlight.FieldOptions globalOptions = globalOptionsBuilder.build(); if (globalOptions.preTags() != null && globalOptions.postTags() == null) { - throw new ElasticsearchIllegalArgumentException("Highlighter global preTags are set, but global postTags are not set"); + throw new IllegalArgumentException("Highlighter global preTags are set, but global postTags are not set"); } final List fields = Lists.newArrayList(); diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java index e246fd214b9ae..d1de1f5de8a8e 100644 --- a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.highlight.*; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.text.StringText; import org.elasticsearch.common.text.Text; import org.elasticsearch.index.mapper.FieldMapper; @@ -83,7 +83,7 @@ public HighlightField highlight(HighlighterContext highlighterContext) { } else if ("span".equals(field.fieldOptions().fragmenter())) { fragmenter = new SimpleSpanFragmenter(queryScorer, field.fieldOptions().fragmentCharSize()); } else { - throw new ElasticsearchIllegalArgumentException("unknown fragmenter option [" + field.fieldOptions().fragmenter() + "] for the field [" + highlighterContext.fieldName + "]"); + throw new IllegalArgumentException("unknown fragmenter option [" + field.fieldOptions().fragmenter() + "] for the field [" + highlighterContext.fieldName + "]"); } Formatter formatter = new SimpleHTMLFormatter(field.fieldOptions().preTags()[0], field.fieldOptions().postTags()[0]); diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java index 5da34fe5d5e53..8ad5a060a73ad 100644 --- a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java @@ -41,7 +41,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.UnicodeUtil; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.text.StringText; @@ -75,7 +75,7 @@ public HighlightField highlight(HighlighterContext highlighterContext) { FieldMapper fieldMapper = highlighterContext.mapper; SearchContextHighlight.Field field = highlighterContext.field; if (fieldMapper.fieldType().indexOptions() != IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) { - throw new ElasticsearchIllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with positions and offsets in the postings list to be used with postings highlighter"); + throw new IllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with positions and offsets in the postings list to be used with postings highlighter"); } SearchContext context = highlighterContext.context; diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java index bbdeece6ff00d..4c7a190672318 100644 --- a/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java +++ b/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.lookup; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldDataService; import org.elasticsearch.index.fielddata.ScriptDocValues; @@ -76,7 +76,7 @@ public Object get(Object key) { if (scriptValues == null) { FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName, types); if (mapper == null) { - throw new ElasticsearchIllegalArgumentException("No field found for [" + fieldName + "] in mapping with types " + Arrays.toString(types) + ""); + throw new IllegalArgumentException("No field found for [" + fieldName + "] in mapping with types " + Arrays.toString(types) + ""); } scriptValues = fieldDataService.getForField(mapper).load(reader).getScriptValues(); localCacheFieldData.put(fieldName, scriptValues); diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java index af246b8ba15c9..ccc81a1b68441 100644 --- a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java +++ b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java @@ -22,7 +22,7 @@ import com.google.common.collect.Maps; import org.apache.lucene.index.LeafReader; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.fieldvisitor.SingleFieldsVisitor; @@ -139,7 +139,7 @@ private FieldLookup loadFieldData(String name) { if (data == null) { FieldMapper mapper = mapperService.smartNameFieldMapper(name, types); if (mapper == null) { - throw new ElasticsearchIllegalArgumentException("No field found for [" + name + "] in mapping with types " + Arrays.toString(types) + ""); + throw new IllegalArgumentException("No field found for [" + name + "] in mapping with types " + Arrays.toString(types) + ""); } data = new FieldLookup(mapper); cachedFieldData.put(name, data); diff --git a/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java b/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java index f4c531e2f2725..1d39b4320089c 100644 --- a/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java +++ b/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.query; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; @@ -35,7 +35,7 @@ public void parse(XContentParser parser, SearchContext context) throws Exception if (token == XContentParser.Token.VALUE_NUMBER) { int terminateAfterCount = parser.intValue(); if (terminateAfterCount <= 0) { - throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0"); + throw new IllegalArgumentException("terminateAfter must be > 0"); } context.terminateAfter(parser.intValue()); } diff --git a/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java index e26a6ebc58b63..9f63a59cd6b4a 100644 --- a/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java +++ b/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java @@ -24,8 +24,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.query.ParsedQuery; @@ -211,10 +211,10 @@ public RescoreSearchContext parse(XContentParser parser, SearchContext context) } else if ("multiply".equals(sScoreMode)) { rescoreContext.setScoreMode(ScoreMode.Multiply); } else { - throw new ElasticsearchIllegalArgumentException("[rescore] illegal score_mode [" + sScoreMode + "]"); + throw new IllegalArgumentException("[rescore] illegal score_mode [" + sScoreMode + "]"); } } else { - throw new ElasticsearchIllegalArgumentException("rescore doesn't support [" + fieldName + "]"); + throw new IllegalArgumentException("rescore doesn't support [" + fieldName + "]"); } } } @@ -314,7 +314,7 @@ public void extractTerms(SearchContext context, RescoreSearchContext rescoreCont try { context.searcher().createNormalizedWeight(((QueryRescoreContext) rescoreContext).query(), false).extractTerms(termsSet); } catch (IOException e) { - throw new ElasticsearchIllegalStateException("Failed to extract terms", e); + throw new IllegalStateException("Failed to extract terms", e); } } diff --git a/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java b/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java index f87165e584b5b..ecabfe6856f5b 100644 --- a/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java +++ b/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.rescore; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; @@ -62,12 +62,12 @@ public void parseSingleRescoreContext(XContentParser parser, SearchContext conte if ("window_size".equals(fieldName)) { windowSize = parser.intValue(); } else { - throw new ElasticsearchIllegalArgumentException("rescore doesn't support [" + fieldName + "]"); + throw new IllegalArgumentException("rescore doesn't support [" + fieldName + "]"); } } } if (rescoreContext == null) { - throw new ElasticsearchIllegalArgumentException("missing rescore type"); + throw new IllegalArgumentException("missing rescore type"); } if (windowSize != null) { rescoreContext.setWindowSize(windowSize.intValue()); diff --git a/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java index 1e1445ec48044..fa8fb6790975b 100644 --- a/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java +++ b/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.sort; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.FilterBuilder; @@ -53,7 +53,7 @@ public class FieldSortBuilder extends SortBuilder { */ public FieldSortBuilder(String fieldName) { if (fieldName == null) { - throw new ElasticsearchIllegalArgumentException("fieldName must not be null"); + throw new IllegalArgumentException("fieldName must not be null"); } this.fieldName = fieldName; } diff --git a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java index 7f3aaf63f495c..e78d90be38f1c 100644 --- a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java +++ b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.join.BitDocIdSetFilter; import org.apache.lucene.util.BitSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoDistance.FixedSourceDistance; @@ -136,12 +136,12 @@ public SortField parse(XContentParser parser, SearchContext context) throws Exce } if (sortMode == MultiValueMode.SUM) { - throw new ElasticsearchIllegalArgumentException("sort_mode [sum] isn't supported for sorting by geo distance"); + throw new IllegalArgumentException("sort_mode [sum] isn't supported for sorting by geo distance"); } FieldMapper mapper = context.smartNameFieldMapper(fieldName); if (mapper == null) { - throw new ElasticsearchIllegalArgumentException("failed to find mapper for [" + fieldName + "] for geo distance based sort"); + throw new IllegalArgumentException("failed to find mapper for [" + fieldName + "] for geo distance based sort"); } final MultiValueMode finalSortMode = sortMode; // final reference for use in the anonymous class final IndexGeoPointFieldData geoIndexFieldData = context.fieldData().getForField(mapper); diff --git a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java index 17eebafae0978..bb7656a9ebcfd 100644 --- a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java +++ b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.join.BitDocIdSetFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.lucene.search.Queries; @@ -89,7 +89,7 @@ public void parse(XContentParser parser, SearchContext context) throws Exception } else if (token == XContentParser.Token.VALUE_STRING) { addSortField(context, sortFields, parser.text(), false, null, null, null, null); } else { - throw new ElasticsearchIllegalArgumentException("malformed sort format, within the sort array, an object, or an actual string are allowed"); + throw new IllegalArgumentException("malformed sort format, within the sort array, an object, or an actual string are allowed"); } } } else if (token == XContentParser.Token.VALUE_STRING) { @@ -97,7 +97,7 @@ public void parse(XContentParser parser, SearchContext context) throws Exception } else if (token == XContentParser.Token.START_OBJECT) { addCompoundSortField(parser, context, sortFields); } else { - throw new ElasticsearchIllegalArgumentException("malformed sort format, either start with array, object, or an actual string"); + throw new IllegalArgumentException("malformed sort format, either start with array, object, or an actual string"); } if (!sortFields.isEmpty()) { // optimize if we just sort on score non reversed, we don't really need sorting @@ -137,7 +137,7 @@ private void addCompoundSortField(XContentParser parser, SearchContext context, } else if (direction.equals("desc")) { reverse = !SCORE_FIELD_NAME.equals(fieldName); } else { - throw new ElasticsearchIllegalArgumentException("sort direction [" + fieldName + "] not supported"); + throw new IllegalArgumentException("sort direction [" + fieldName + "] not supported"); } addSortField(context, sortFields, fieldName, reverse, unmappedType, missing, sortMode, nestedFilterParseHelper); } else { @@ -174,7 +174,7 @@ private void addCompoundSortField(XContentParser parser, SearchContext context, } nestedFilterParseHelper.setPath(parser.text()); } else { - throw new ElasticsearchIllegalArgumentException("sort option [" + innerJsonName + "] not supported"); + throw new IllegalArgumentException("sort option [" + innerJsonName + "] not supported"); } } else if (token == XContentParser.Token.START_OBJECT) { if ("nested_filter".equals(innerJsonName) || "nestedFilter".equals(innerJsonName)) { @@ -183,7 +183,7 @@ private void addCompoundSortField(XContentParser parser, SearchContext context, } nestedFilterParseHelper.filter(); } else { - throw new ElasticsearchIllegalArgumentException("sort option [" + innerJsonName + "] not supported"); + throw new IllegalArgumentException("sort option [" + innerJsonName + "] not supported"); } } } diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/src/main/java/org/elasticsearch/search/suggest/Suggest.java index 84b324c92c50a..f4057cacc0cc7 100644 --- a/src/main/java/org/elasticsearch/search/suggest/Suggest.java +++ b/src/main/java/org/elasticsearch/search/suggest/Suggest.java @@ -20,8 +20,8 @@ import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; -import org.elasticsearch.Version; +import java.lang.IllegalStateException; + import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; @@ -253,7 +253,7 @@ public Suggestion reduce(List> toReduce) { for (int i = 0; i < size; i++) { for (Suggestion suggestion : toReduce) { if(suggestion.entries.size() != size) { - throw new ElasticsearchIllegalStateException("Can't merge suggest result, this might be caused by suggest calls " + + throw new IllegalStateException("Can't merge suggest result, this might be caused by suggest calls " + "across multiple indices with different analysis chains. Suggest entries have different sizes actual [" + suggestion.entries.size() + "] expected [" + size +"]"); } @@ -375,7 +375,7 @@ protected > Entry reduce(List toReduce) { Entry leader = toReduce.get(0); for (Entry entry : toReduce) { if (!leader.text.equals(entry.text)) { - throw new ElasticsearchIllegalStateException("Can't merge suggest entries, this might be caused by suggest calls " + + throw new IllegalStateException("Can't merge suggest entries, this might be caused by suggest calls " + "across multiple indices with different analysis chains. Suggest entries have different text actual [" + entry.text + "] expected [" + leader.text +"]"); } diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java index fa0cfbef13902..652d7e3a7ed73 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.client.Requests; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; @@ -32,8 +32,6 @@ import org.elasticsearch.search.suggest.context.ContextMapping.ContextQuery; import org.elasticsearch.search.suggest.context.CategoryContextMapping; import org.elasticsearch.search.suggest.context.GeolocationContextMapping; -import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; -import org.elasticsearch.search.suggest.term.TermSuggestionBuilder; /** * Defines how to perform suggesting. This builders allows a number of global options to be specified and @@ -288,7 +286,7 @@ public T analyzer(String analyzer) { @SuppressWarnings("unchecked") public T size(int size) { if (size <= 0) { - throw new ElasticsearchIllegalArgumentException("Size must be positive"); + throw new IllegalArgumentException("Size must be positive"); } this.size = size; return (T)this; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java b/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java index 728eabb065c5a..2a25215eb9ae9 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.suggest; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MapperService; @@ -63,7 +63,7 @@ public SuggestionSearchContext parseInternal(XContentParser parser, MapperServic if ("text".equals(fieldName)) { globalText = parser.utf8Bytes(); } else { - throw new ElasticsearchIllegalArgumentException("[suggest] does not support [" + fieldName + "]"); + throw new IllegalArgumentException("[suggest] does not support [" + fieldName + "]"); } } else if (token == XContentParser.Token.START_OBJECT) { String suggestionName = fieldName; @@ -77,14 +77,14 @@ public SuggestionSearchContext parseInternal(XContentParser parser, MapperServic if ("text".equals(fieldName)) { suggestText = parser.utf8Bytes(); } else { - throw new ElasticsearchIllegalArgumentException("[suggest] does not support [" + fieldName + "]"); + throw new IllegalArgumentException("[suggest] does not support [" + fieldName + "]"); } } else if (token == XContentParser.Token.START_OBJECT) { if (suggestionName == null) { - throw new ElasticsearchIllegalArgumentException("Suggestion must have name"); + throw new IllegalArgumentException("Suggestion must have name"); } if (suggesters.get(fieldName) == null) { - throw new ElasticsearchIllegalArgumentException("Suggester[" + fieldName + "] not supported"); + throw new IllegalArgumentException("Suggester[" + fieldName + "] not supported"); } final SuggestContextParser contextParser = suggesters.get(fieldName).getContextParser(); suggestionContext = contextParser.parse(parser, mapperService); diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java index 1e355ef3fcca6..c28201bfd92b7 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java @@ -29,7 +29,7 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.automaton.LevenshteinAutomata; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.FastCharArrayReader; import org.elasticsearch.common.xcontent.XContentParser; @@ -65,7 +65,7 @@ public static DirectSpellChecker getDirectSpellChecker(DirectSpellcheckerSetting comparator = LUCENE_FREQUENCY; break; default: - throw new ElasticsearchIllegalArgumentException("Illegal suggest sort: " + suggestion.sort()); + throw new IllegalArgumentException("Illegal suggest sort: " + suggestion.sort()); } directSpellChecker.setComparator(comparator); directSpellChecker.setDistance(suggestion.stringDistance()); @@ -144,7 +144,7 @@ public static SuggestMode resolveSuggestMode(String suggestMode) { } else if ("always".equals(suggestMode)) { return SuggestMode.SUGGEST_ALWAYS; } else { - throw new ElasticsearchIllegalArgumentException("Illegal suggest mode " + suggestMode); + throw new IllegalArgumentException("Illegal suggest mode " + suggestMode); } } @@ -154,7 +154,7 @@ public static Suggest.Suggestion.Sort resolveSort(String sortVal) { } else if ("frequency".equals(sortVal)) { return Suggest.Suggestion.Sort.FREQUENCY; } else { - throw new ElasticsearchIllegalArgumentException("Illegal suggest sort " + sortVal); + throw new IllegalArgumentException("Illegal suggest sort " + sortVal); } } @@ -171,7 +171,7 @@ public static StringDistance resolveDistance(String distanceVal) { } else if ("ngram".equals(distanceVal)) { return new NGramDistance(); } else { - throw new ElasticsearchIllegalArgumentException("Illegal distance option " + distanceVal); + throw new IllegalArgumentException("Illegal distance option " + distanceVal); } } @@ -203,7 +203,7 @@ public static boolean parseDirectSpellcheckerSettings(XContentParser parser, Str } else if (Fields.MAX_EDITS.match(fieldName)) { suggestion.maxEdits(parser.intValue()); if (suggestion.maxEdits() < 1 || suggestion.maxEdits() > LevenshteinAutomata.MAXIMUM_SUPPORTED_DISTANCE) { - throw new ElasticsearchIllegalArgumentException("Illegal max_edits value " + suggestion.maxEdits()); + throw new IllegalArgumentException("Illegal max_edits value " + suggestion.maxEdits()); } } else if (Fields.MAX_INSPECTIONS.match(fieldName)) { suggestion.maxInspections(parser.intValue()); @@ -228,7 +228,7 @@ public static boolean parseSuggestContext(XContentParser parser, MapperService m String analyzerName = parser.text(); Analyzer analyzer = mapperService.analysisService().analyzer(analyzerName); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); + throw new IllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); } suggestion.setAnalyzer(analyzer); } else if ("field".equals(fieldName)) { @@ -248,11 +248,11 @@ public static boolean parseSuggestContext(XContentParser parser, MapperService m public static void verifySuggestion(MapperService mapperService, BytesRef globalText, SuggestionContext suggestion) { // Verify options and set defaults if (suggestion.getField() == null) { - throw new ElasticsearchIllegalArgumentException("The required field option is missing"); + throw new IllegalArgumentException("The required field option is missing"); } if (suggestion.getText() == null) { if (globalText == null) { - throw new ElasticsearchIllegalArgumentException("The required text option is missing"); + throw new IllegalArgumentException("The required text option is missing"); } suggestion.setText(globalText); } diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java index bf03527f69886..59aecba1e060b 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java @@ -20,7 +20,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import java.util.LinkedHashMap; import java.util.Map; @@ -87,7 +87,7 @@ public int getSize() { public void setSize(int size) { if (size <= 0) { - throw new ElasticsearchIllegalArgumentException("Size must be positive but was: " + size); + throw new IllegalArgumentException("Size must be positive but was: " + size); } this.size = size; } @@ -98,7 +98,7 @@ public Integer getShardSize() { public void setShardSize(int shardSize) { if (shardSize <= 0) { - throw new ElasticsearchIllegalArgumentException("ShardSize must be positive but was: " + shardSize); + throw new IllegalArgumentException("ShardSize must be positive but was: " + shardSize); } this.shardSize = shardSize; } diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java b/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java index 4606d824f721b..88be9d2a22f8c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java +++ b/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java @@ -44,7 +44,7 @@ import org.apache.lucene.util.Accountables; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; @@ -176,7 +176,7 @@ public CompletionFieldsProducer(SegmentReadState state) throws IOException { String providerName = input.readString(); CompletionLookupProvider completionLookupProvider = providers.get(providerName); if (completionLookupProvider == null) { - throw new ElasticsearchIllegalStateException("no provider with name [" + providerName + "] registered"); + throw new IllegalStateException("no provider with name [" + providerName + "] registered"); } // TODO: we could clone the ReadState and make it always forward IOContext.MERGE to prevent unecessary heap usage? delegateProducer = delegatePostingsFormat.fieldsProducer(state); diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java index aad44e31da57e..bbf65de6a4506 100644 --- a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.suggest.completion; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.unit.Fuzziness; @@ -93,10 +93,10 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma BytesReference bytes = builder.bytes(); contextParser = parser.contentType().xContent().createParser(bytes); } else { - throw new ElasticsearchIllegalArgumentException("suggester [completion] doesn't support field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester [completion] doesn't support field [" + fieldName + "]"); } } else { - throw new ElasticsearchIllegalArgumentException("suggester[completion] doesn't support field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[completion] doesn't support field [" + fieldName + "]"); } } @@ -106,14 +106,14 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma if (mapper != null) { if (mapper.requiresContext()) { if (contextParser == null) { - throw new ElasticsearchIllegalArgumentException("suggester [completion] requires context to be setup"); + throw new IllegalArgumentException("suggester [completion] requires context to be setup"); } else { contextParser.nextToken(); List contextQueries = ContextQuery.parseQueries(mapper.getContextMapping(), contextParser); suggestion.setContextQuery(contextQueries); } } else if (contextParser != null) { - throw new ElasticsearchIllegalArgumentException("suggester [completion] doesn't expect any context"); + throw new IllegalArgumentException("suggester [completion] doesn't expect any context"); } } return suggestion; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java index 03ce464b78547..9f615eb9f6d6e 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -26,7 +26,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.search.suggest.SuggestUtils; import java.io.IOException; @@ -58,7 +58,7 @@ public DirectCandidateGenerator(DirectSpellChecker spellchecker, String field, S public DirectCandidateGenerator(DirectSpellChecker spellchecker, String field, SuggestMode suggestMode, IndexReader reader, double nonErrorLikelihood, int numCandidates, Analyzer preFilter, Analyzer postFilter, Terms terms) throws IOException { if (terms == null) { - throw new ElasticsearchIllegalArgumentException("generator field [" + field + "] doesn't exist"); + throw new IllegalArgumentException("generator field [" + field + "] doesn't exist"); } this.spellchecker = spellchecker; this.field = field; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java index 5fe964017d94e..18e974336b587 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Terms; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; @@ -63,24 +63,24 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma if ("real_word_error_likelihood".equals(fieldName) || "realWorldErrorLikelihood".equals(fieldName)) { suggestion.setRealWordErrorLikelihood(parser.floatValue()); if (suggestion.realworldErrorLikelyhood() <= 0.0) { - throw new ElasticsearchIllegalArgumentException("real_word_error_likelihood must be > 0.0"); + throw new IllegalArgumentException("real_word_error_likelihood must be > 0.0"); } } else if ("confidence".equals(fieldName)) { suggestion.setConfidence(parser.floatValue()); if (suggestion.confidence() < 0.0) { - throw new ElasticsearchIllegalArgumentException("confidence must be >= 0.0"); + throw new IllegalArgumentException("confidence must be >= 0.0"); } } else if ("separator".equals(fieldName)) { suggestion.setSeparator(new BytesRef(parser.text())); } else if ("max_errors".equals(fieldName) || "maxErrors".equals(fieldName)) { suggestion.setMaxErrors(parser.floatValue()); if (suggestion.maxErrors() <= 0.0) { - throw new ElasticsearchIllegalArgumentException("max_error must be > 0.0"); + throw new IllegalArgumentException("max_error must be > 0.0"); } } else if ("gram_size".equals(fieldName) || "gramSize".equals(fieldName)) { suggestion.setGramSize(parser.intValue()); if (suggestion.gramSize() < 1) { - throw new ElasticsearchIllegalArgumentException("gram_size must be >= 1"); + throw new IllegalArgumentException("gram_size must be >= 1"); } gramSizeSet = true; } else if ("force_unigrams".equals(fieldName) || "forceUnigrams".equals(fieldName)) { @@ -88,11 +88,11 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma } else if ("token_limit".equals(fieldName) || "tokenLimit".equals(fieldName)) { int tokenLimit = parser.intValue(); if (tokenLimit <= 0) { - throw new ElasticsearchIllegalArgumentException("token_limit must be >= 1"); + throw new IllegalArgumentException("token_limit must be >= 1"); } suggestion.setTokenLimit(tokenLimit); } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase] doesn't support field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase] doesn't support field [" + fieldName + "]"); } } } else if (token == Token.START_ARRAY) { @@ -112,7 +112,7 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma suggestion.addGenerator(generator); } } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase] doesn't support array field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase] doesn't support array field [" + fieldName + "]"); } } else if (token == Token.START_OBJECT) { if ("smoothing".equals(fieldName)) { @@ -127,7 +127,7 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma } else if ("post_tag".equals(fieldName) || "postTag".equals(fieldName)) { suggestion.setPostTag(parser.utf8Bytes()); } else { - throw new ElasticsearchIllegalArgumentException( + throw new IllegalArgumentException( "suggester[phrase][highlight] doesn't support field [" + fieldName + "]"); } } @@ -146,13 +146,13 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma templateNameOrTemplateContent = parser.text(); } if (templateNameOrTemplateContent == null) { - throw new ElasticsearchIllegalArgumentException("suggester[phrase][collate] no query/filter found in collate object"); + throw new IllegalArgumentException("suggester[phrase][collate] no query/filter found in collate object"); } if (suggestion.getCollateFilterScript() != null) { - throw new ElasticsearchIllegalArgumentException("suggester[phrase][collate] filter already set, doesn't support additional [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase][collate] filter already set, doesn't support additional [" + fieldName + "]"); } if (suggestion.getCollateQueryScript() != null) { - throw new ElasticsearchIllegalArgumentException("suggester[phrase][collate] query already set, doesn't support additional [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase][collate] query already set, doesn't support additional [" + fieldName + "]"); } CompiledScript compiledScript = suggester.scriptService().compile(new Script(MustacheScriptEngineService.NAME, templateNameOrTemplateContent, ScriptType.INLINE, null), ScriptContext.Standard.SEARCH); if ("query".equals(fieldName)) { @@ -168,28 +168,28 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma if (parser.isBooleanValue()) { suggestion.setCollatePrune(parser.booleanValue()); } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase][collate] prune must be either 'true' or 'false'"); + throw new IllegalArgumentException("suggester[phrase][collate] prune must be either 'true' or 'false'"); } } else { - throw new ElasticsearchIllegalArgumentException( + throw new IllegalArgumentException( "suggester[phrase][collate] doesn't support field [" + fieldName + "]"); } } } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase] doesn't support array field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase] doesn't support array field [" + fieldName + "]"); } } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase] doesn't support field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase] doesn't support field [" + fieldName + "]"); } } if (suggestion.getField() == null) { - throw new ElasticsearchIllegalArgumentException("The required field option is missing"); + throw new IllegalArgumentException("The required field option is missing"); } FieldMapper fieldMapper = mapperService.smartNameFieldMapper(suggestion.getField()); if (fieldMapper == null) { - throw new ElasticsearchIllegalArgumentException("No mapping found for field [" + suggestion.getField() + "]"); + throw new IllegalArgumentException("No mapping found for field [" + suggestion.getField() + "]"); } else if (suggestion.getAnalyzer() == null) { // no analyzer name passed in, so try the field's analyzer, or the default analyzer if (fieldMapper.searchAnalyzer() == null) { @@ -210,13 +210,13 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma if (shingleFilterFactory != null) { suggestion.setGramSize(shingleFilterFactory.getMaxShingleSize()); if (suggestion.getAnalyzer() == null && shingleFilterFactory.getMinShingleSize() > 1 && !shingleFilterFactory.getOutputUnigrams()) { - throw new ElasticsearchIllegalArgumentException("The default analyzer for field: [" + suggestion.getField() + "] doesn't emit unigrams. If this is intentional try to set the analyzer explicitly"); + throw new IllegalArgumentException("The default analyzer for field: [" + suggestion.getField() + "] doesn't emit unigrams. If this is intentional try to set the analyzer explicitly"); } } } if (suggestion.generators().isEmpty()) { if (shingleFilterFactory != null && shingleFilterFactory.getMinShingleSize() > 1 && !shingleFilterFactory.getOutputUnigrams() && suggestion.getRequireUnigram()) { - throw new ElasticsearchIllegalArgumentException("The default candidate generator for phrase suggest can't operate on field: [" + suggestion.getField() + "] since it doesn't emit unigrams. If this is intentional try to set the candidate generator field explicitly"); + throw new IllegalArgumentException("The default candidate generator for phrase suggest can't operate on field: [" + suggestion.getField() + "] since it doesn't emit unigrams. If this is intentional try to set the candidate generator field explicitly"); } // use a default generator on the same field DirectCandidateGenerator generator = new DirectCandidateGenerator(); @@ -246,20 +246,20 @@ public void parseSmoothingModel(XContentParser parser, PhraseSuggestionContext s if ("trigram_lambda".equals(fieldName) || "trigramLambda".equals(fieldName)) { lambdas[0] = parser.doubleValue(); if (lambdas[0] < 0) { - throw new ElasticsearchIllegalArgumentException("trigram_lambda must be positive"); + throw new IllegalArgumentException("trigram_lambda must be positive"); } } else if ("bigram_lambda".equals(fieldName) || "bigramLambda".equals(fieldName)) { lambdas[1] = parser.doubleValue(); if (lambdas[1] < 0) { - throw new ElasticsearchIllegalArgumentException("bigram_lambda must be positive"); + throw new IllegalArgumentException("bigram_lambda must be positive"); } } else if ("unigram_lambda".equals(fieldName) || "unigramLambda".equals(fieldName)) { lambdas[2] = parser.doubleValue(); if (lambdas[2] < 0) { - throw new ElasticsearchIllegalArgumentException("unigram_lambda must be positive"); + throw new IllegalArgumentException("unigram_lambda must be positive"); } } else { - throw new ElasticsearchIllegalArgumentException( + throw new IllegalArgumentException( "suggester[phrase][smoothing][linear] doesn't support field [" + fieldName + "]"); } } @@ -269,7 +269,7 @@ public void parseSmoothingModel(XContentParser parser, PhraseSuggestionContext s sum += lambdas[i]; } if (Math.abs(sum - 1.0) > 0.001) { - throw new ElasticsearchIllegalArgumentException("linear smoothing lambdas must sum to 1"); + throw new IllegalArgumentException("linear smoothing lambdas must sum to 1"); } suggestion.setModel(new WordScorer.WordScorerFactory() { @Override @@ -321,7 +321,7 @@ public WordScorer newScorer(IndexReader reader, Terms terms, String field, doubl }); } else { - throw new ElasticsearchIllegalArgumentException("suggester[phrase] doesn't support object field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[phrase] doesn't support object field [" + fieldName + "]"); } } } @@ -329,14 +329,14 @@ public WordScorer newScorer(IndexReader reader, Terms terms, String field, doubl private void ensureNoSmoothing(PhraseSuggestionContext suggestion) { if (suggestion.model() != null) { - throw new ElasticsearchIllegalArgumentException("only one smoothing model supported"); + throw new IllegalArgumentException("only one smoothing model supported"); } } private void verifyGenerator(PhraseSuggestionContext.DirectCandidateGenerator suggestion) { // Verify options and set defaults if (suggestion.field() == null) { - throw new ElasticsearchIllegalArgumentException("The required field option is missing"); + throw new IllegalArgumentException("The required field option is missing"); } } @@ -346,7 +346,7 @@ private void parseCandidateGenerator(XContentParser parser, MapperService mapper if ("field".equals(fieldName)) { generator.setField(parser.text()); if (mapperService.smartNameFieldMapper(generator.field()) == null) { - throw new ElasticsearchIllegalArgumentException("No mapping found for field [" + generator.field() + "]"); + throw new IllegalArgumentException("No mapping found for field [" + generator.field() + "]"); } } else if ("size".equals(fieldName)) { generator.size(parser.intValue()); @@ -354,18 +354,18 @@ private void parseCandidateGenerator(XContentParser parser, MapperService mapper String analyzerName = parser.text(); Analyzer analyzer = mapperService.analysisService().analyzer(analyzerName); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); + throw new IllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); } generator.preFilter(analyzer); } else if ("post_filter".equals(fieldName) || "postFilter".equals(fieldName)) { String analyzerName = parser.text(); Analyzer analyzer = mapperService.analysisService().analyzer(analyzerName); if (analyzer == null) { - throw new ElasticsearchIllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); + throw new IllegalArgumentException("Analyzer [" + analyzerName + "] doesn't exists"); } generator.postFilter(analyzer); } else { - throw new ElasticsearchIllegalArgumentException("CandidateGenerator doesn't support [" + fieldName + "]"); + throw new IllegalArgumentException("CandidateGenerator doesn't support [" + fieldName + "]"); } } } diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index afa5595688aae..a66c715f3bc1c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.search.suggest.phrase; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder; @@ -59,7 +59,7 @@ public PhraseSuggestionBuilder(String name) { */ public PhraseSuggestionBuilder gramSize(int gramSize) { if (gramSize < 1) { - throw new ElasticsearchIllegalArgumentException("gramSize must be >= 1"); + throw new IllegalArgumentException("gramSize must be >= 1"); } this.gramSize = gramSize; return this; @@ -164,7 +164,7 @@ public PhraseSuggestionBuilder tokenLimit(int tokenLimit) { */ public PhraseSuggestionBuilder highlight(String preTag, String postTag) { if ((preTag == null) != (postTag == null)) { - throw new ElasticsearchIllegalArgumentException("Pre and post tag must both be null or both not be null."); + throw new IllegalArgumentException("Pre and post tag must both be null or both not be null."); } this.preTag = preTag; this.postTag = postTag; @@ -490,7 +490,7 @@ public DirectCandidateGenerator accuracy(float accuracy) { */ public DirectCandidateGenerator size(int size) { if (size <= 0) { - throw new ElasticsearchIllegalArgumentException("Size must be positive"); + throw new IllegalArgumentException("Size must be positive"); } this.size = size; return this; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java index eff012b9c8037..cc20d356e0a7c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.routing.Preference; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; @@ -134,7 +134,7 @@ public int size() { public void size(int size) { if (size <= 0) { - throw new ElasticsearchIllegalArgumentException("Size must be positive"); + throw new IllegalArgumentException("Size must be positive"); } this.size = size; } diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java index fd5bd81837465..ce85a65206431 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.index.FreqTermsEnum; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.Candidate; @@ -52,7 +52,7 @@ public WordScorer(IndexReader reader, String field, double realWordLikelyHood, B public WordScorer(IndexReader reader, Terms terms, String field, double realWordLikelyHood, BytesRef separator) throws IOException { this.field = field; if (terms == null) { - throw new ElasticsearchIllegalArgumentException("Field: [" + field + "] does not exist"); + throw new IllegalArgumentException("Field: [" + field + "] does not exist"); } this.terms = terms; final long vocSize = terms.getSumTotalTermFreq(); diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java index b0d50ceb66dfa..b16937bb41743 100644 --- a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java @@ -20,7 +20,7 @@ import java.io.IOException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; @@ -48,7 +48,7 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma } else if (token.isValue()) { parseTokenValue(parser, mapperService, fieldName, suggestion, settings); } else { - throw new ElasticsearchIllegalArgumentException("suggester[term] doesn't support field [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[term] doesn't support field [" + fieldName + "]"); } } return suggestion; @@ -58,7 +58,7 @@ private void parseTokenValue(XContentParser parser, MapperService mapperService, DirectSpellcheckerSettings settings) throws IOException { if (!(SuggestUtils.parseSuggestContext(parser, mapperService, fieldName, suggestion) || SuggestUtils.parseDirectSpellcheckerSettings( parser, fieldName, settings))) { - throw new ElasticsearchIllegalArgumentException("suggester[term] doesn't support [" + fieldName + "]"); + throw new IllegalArgumentException("suggester[term] doesn't support [" + fieldName + "]"); } } diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotState.java b/src/main/java/org/elasticsearch/snapshots/SnapshotState.java index 51ca694b84f10..41eaa27160477 100644 --- a/src/main/java/org/elasticsearch/snapshots/SnapshotState.java +++ b/src/main/java/org/elasticsearch/snapshots/SnapshotState.java @@ -19,7 +19,7 @@ package org.elasticsearch.snapshots; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; /** * Represents the state that a snapshot can be in @@ -99,7 +99,7 @@ public static SnapshotState fromValue(byte value) { case 3: return PARTIAL; default: - throw new ElasticsearchIllegalArgumentException("No snapshot state for value [" + value + "]"); + throw new IllegalArgumentException("No snapshot state for value [" + value + "]"); } } } diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java index 0a0236a8ca81f..80d99563adac3 100644 --- a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java +++ b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; import org.apache.lucene.util.Counter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; @@ -142,7 +142,7 @@ public ThreadPool(Settings settings, @Nullable NodeSettingsService nodeSettingsS executors.put(Names.SAME, new ExecutorHolder(MoreExecutors.directExecutor(), new Info(Names.SAME, "same"))); if (!executors.get(Names.GENERIC).info.getType().equals("cached")) { - throw new ElasticsearchIllegalArgumentException("generic thread pool must be of type cached"); + throw new IllegalArgumentException("generic thread pool must be of type cached"); } this.executors = ImmutableMap.copyOf(executors); this.scheduler = new ScheduledThreadPoolExecutor(1, EsExecutors.daemonThreadFactory(settings, "scheduler"), new EsAbortPolicy()); @@ -225,7 +225,7 @@ public Executor generic() { public Executor executor(String name) { Executor executor = executors.get(name).executor(); if (executor == null) { - throw new ElasticsearchIllegalArgumentException("No executor found for [" + name + "]"); + throw new IllegalArgumentException("No executor found for [" + name + "]"); } return executor; } @@ -411,7 +411,7 @@ private ExecutorHolder rebuild(String name, ExecutorHolder previousExecutorHolde Executor executor = EsExecutors.newScaling(min, size, keepAlive.millis(), TimeUnit.MILLISECONDS, threadFactory); return new ExecutorHolder(executor, new Info(name, type, min, size, keepAlive, null)); } - throw new ElasticsearchIllegalArgumentException("No type found [" + type + "], for [" + name + "]"); + throw new IllegalArgumentException("No type found [" + type + "], for [" + name + "]"); } public void updateSettings(Settings settings) { diff --git a/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java index 739ad3040cfa1..dc337b431462a 100644 --- a/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java +++ b/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java @@ -20,7 +20,7 @@ package org.elasticsearch.transport; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.common.util.concurrent.BaseFuture; @@ -45,7 +45,7 @@ public V txGet() throws ElasticsearchException { return get(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new ElasticsearchIllegalStateException("Future got interrupted", e); + throw new IllegalStateException("Future got interrupted", e); } catch (ExecutionException e) { if (e.getCause() instanceof ElasticsearchException) { throw (ElasticsearchException) e.getCause(); @@ -62,7 +62,7 @@ public V txGet(long timeout, TimeUnit unit) throws ElasticsearchException { } catch (TimeoutException e) { throw new ElasticsearchTimeoutException(e.getMessage()); } catch (InterruptedException e) { - throw new ElasticsearchIllegalStateException("Future got interrupted", e); + throw new IllegalStateException("Future got interrupted", e); } catch (ExecutionException e) { if (e.getCause() instanceof ElasticsearchException) { throw (ElasticsearchException) e.getCause(); diff --git a/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java index 24cea1952241d..10be853ccc7c8 100644 --- a/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java +++ b/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import java.lang.reflect.Constructor; @@ -40,7 +40,7 @@ public class RequestHandlerRegistry { try { this.requestConstructor = request.getDeclaredConstructor(); } catch (NoSuchMethodException e) { - throw new ElasticsearchIllegalStateException("failed to create constructor (does it have a default constructor?) for request " + request, e); + throw new IllegalStateException("failed to create constructor (does it have a default constructor?) for request " + request, e); } this.requestConstructor.setAccessible(true); assert newRequest() != null; @@ -57,7 +57,7 @@ public Request newRequest() { try { return requestConstructor.newInstance(); } catch (Exception e) { - throw new ElasticsearchIllegalStateException("failed to instantiate request ", e); + throw new IllegalStateException("failed to instantiate request ", e); } } diff --git a/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java index 5452b020be02e..f8a1e1fb5447c 100644 --- a/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java +++ b/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.unit.TimeValue; /** @@ -52,7 +52,7 @@ public static Type fromString(String type) { } else if ("ping".equalsIgnoreCase(type)) { return PING; } else { - throw new ElasticsearchIllegalArgumentException("failed to match transport type for [" + type + "]"); + throw new IllegalArgumentException("failed to match transport type for [" + type + "]"); } } } diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java index ad17baa908df6..bc031d71d9adb 100644 --- a/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/src/main/java/org/elasticsearch/transport/TransportService.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.settings.ClusterDynamicSettings; import org.elasticsearch.cluster.settings.DynamicSettings; @@ -275,7 +275,7 @@ public void sendRequest(final DiscoveryNode node, public void sendRequest(final DiscoveryNode node, final String action, final TransportRequest request, final TransportRequestOptions options, TransportResponseHandler handler) { if (node == null) { - throw new ElasticsearchIllegalStateException("can't send request to a null node"); + throw new IllegalStateException("can't send request to a null node"); } final long requestId = newRequestId(); final TimeoutHandler timeoutHandler; diff --git a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java index 0201829fe085a..0a8e718738563 100644 --- a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java +++ b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport.netty; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.common.component.Lifecycle; import org.elasticsearch.common.compress.Compressor; @@ -101,7 +101,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex sb.append(buffer.getByte(offset + i)).append(","); } sb.append("]"); - throw new ElasticsearchIllegalStateException(sb.toString()); + throw new IllegalStateException(sb.toString()); } wrappedStream = compressor.streamInput(streamIn); } else { diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java index 1d9914e4b81a5..f098f7d855656 100644 --- a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java +++ b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java @@ -184,13 +184,13 @@ public NettyTransport(Settings settings, ThreadPool threadPool, NetworkService n // we want to have at least 1 for reg/state/ping if (this.connectionsPerNodeReg == 0) { - throw new ElasticsearchIllegalArgumentException("can't set [connection_per_node.reg] to 0"); + throw new IllegalArgumentException("can't set [connection_per_node.reg] to 0"); } if (this.connectionsPerNodePing == 0) { - throw new ElasticsearchIllegalArgumentException("can't set [connection_per_node.ping] to 0"); + throw new IllegalArgumentException("can't set [connection_per_node.ping] to 0"); } if (this.connectionsPerNodeState == 0) { - throw new ElasticsearchIllegalArgumentException("can't set [connection_per_node.state] to 0"); + throw new IllegalArgumentException("can't set [connection_per_node.state] to 0"); } long defaultReceiverPredictor = 512 * 1024; @@ -736,7 +736,7 @@ public void connectToNode(DiscoveryNode node) { public void connectToNode(DiscoveryNode node, boolean light) { if (!lifecycle.started()) { - throw new ElasticsearchIllegalStateException("can't add nodes to a stopped transport"); + throw new IllegalStateException("can't add nodes to a stopped transport"); } if (node == null) { throw new ConnectTransportException(null, "can't connect to a null node"); @@ -746,7 +746,7 @@ public void connectToNode(DiscoveryNode node, boolean light) { connectionLock.acquire(node.id()); try { if (!lifecycle.started()) { - throw new ElasticsearchIllegalStateException("can't add nodes to a stopped transport"); + throw new IllegalStateException("can't add nodes to a stopped transport"); } NodeChannels nodeChannels = connectedNodes.get(node); if (nodeChannels != null) { @@ -1107,7 +1107,7 @@ public Channel channel(TransportRequestOptions.Type type) { } else if (type == TransportRequestOptions.Type.RECOVERY) { return recovery[MathUtils.mod(recoveryCounter.incrementAndGet(), recovery.length)]; } else { - throw new ElasticsearchIllegalArgumentException("no type channel for [" + type + "]"); + throw new IllegalArgumentException("no type channel for [" + type + "]"); } } diff --git a/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java index 0e59fdae14c77..a1f99108883a0 100644 --- a/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java +++ b/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java @@ -19,7 +19,7 @@ package org.elasticsearch.watcher; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -135,7 +135,7 @@ public WatcherHandle add(W watcher, Frequency fre case HIGH: return highMonitor.add(watcher); default: - throw new ElasticsearchIllegalArgumentException("Unknown frequency [" + frequency + "]"); + throw new IllegalArgumentException("Unknown frequency [" + frequency + "]"); } } @@ -155,7 +155,7 @@ public void notifyNow(Frequency frequency) { highMonitor.run(); break; default: - throw new ElasticsearchIllegalArgumentException("Unknown frequency [" + frequency + "]"); + throw new IllegalArgumentException("Unknown frequency [" + frequency + "]"); } } diff --git a/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java index 1c631eb00f5c6..e88489c7e9826 100644 --- a/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java +++ b/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java @@ -21,14 +21,15 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.ShardSearchFailure; -import org.elasticsearch.common.io.BytesStream; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.Index; +import org.elasticsearch.index.IndexException; import org.elasticsearch.index.query.QueryParsingException; +import org.elasticsearch.indices.IndexClosedException; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchShardTarget; @@ -67,10 +68,10 @@ public void testStatus() { public void testGuessRootCause() { { - ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new ElasticsearchIllegalArgumentException("index is closed", new RuntimeException("foobar")))); + ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new IndexException(new Index("foo"), "index is closed", new RuntimeException("foobar")))); ElasticsearchException[] rootCauses = exception.guessRootCauses(); assertEquals(rootCauses.length, 1); - assertEquals(ElasticsearchException.getExceptionName(rootCauses[0]), "illegal_argument_exception"); + assertEquals(ElasticsearchException.getExceptionName(rootCauses[0]), "index_exception"); assertEquals(rootCauses[0].getMessage(), "index is closed"); ShardSearchFailure failure = new ShardSearchFailure(new QueryParsingException(new Index("foo"), "foobar"), new SearchShardTarget("node_1", "foo", 1)); ShardSearchFailure failure1 = new ShardSearchFailure(new QueryParsingException(new Index("foo"), "foobar"), new SearchShardTarget("node_1", "foo", 2)); @@ -143,20 +144,20 @@ public void testDeduplicate() throws IOException { public void testGetRootCause() { Exception root = new RuntimeException("foobar"); - ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new ElasticsearchIllegalArgumentException("index is closed", root))); + ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new IllegalArgumentException("index is closed", root))); assertEquals(root, exception.getRootCause()); assertTrue(exception.contains(RuntimeException.class)); assertFalse(exception.contains(EOFException.class)); } public void testToString() { - ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new ElasticsearchIllegalArgumentException("index is closed", new RuntimeException("foobar")))); - assertEquals("ElasticsearchException[foo]; nested: ElasticsearchException[bar]; nested: ElasticsearchIllegalArgumentException[index is closed]; nested: RuntimeException[foobar];", exception.toString()); + ElasticsearchException exception = new ElasticsearchException("foo", new ElasticsearchException("bar", new IllegalArgumentException("index is closed", new RuntimeException("foobar")))); + assertEquals("ElasticsearchException[foo]; nested: ElasticsearchException[bar]; nested: IllegalArgumentException[index is closed]; nested: RuntimeException[foobar];", exception.toString()); } public void testToXContent() throws IOException { { - ElasticsearchException ex = new ElasticsearchException("foo", new ElasticsearchException("bar", new ElasticsearchIllegalArgumentException("index is closed", new RuntimeException("foobar")))); + ElasticsearchException ex = new ElasticsearchException("foo", new ElasticsearchException("bar", new IllegalArgumentException("index is closed", new RuntimeException("foobar")))); XContentBuilder builder = XContentFactory.jsonBuilder(); builder.startObject(); ex.toXContent(builder, ToXContent.EMPTY_PARAMS); diff --git a/src/test/java/org/elasticsearch/VersionTests.java b/src/test/java/org/elasticsearch/VersionTests.java index c78c3118e5758..65d6a4f25e2a2 100644 --- a/src/test/java/org/elasticsearch/VersionTests.java +++ b/src/test/java/org/elasticsearch/VersionTests.java @@ -117,7 +117,7 @@ public void testWrongVersionFromString() { Version.fromString("WRONG.VERSION"); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testVersionNoPresentInSettings() { Version.indexCreated(ImmutableSettings.builder().build()); } diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java index a7e31e0c52ba6..972acfd09a6bd 100644 --- a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java +++ b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.create; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -111,7 +111,7 @@ public void testInvalidShardCountSettings() throws Exception { .build()) .get(); fail("should have thrown an exception about the primary shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 1 or more primary shards"), equalTo(true)); } @@ -122,7 +122,7 @@ public void testInvalidShardCountSettings() throws Exception { .build()) .get(); fail("should have thrown an exception about the replica shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 0 or more replica shards"), equalTo(true)); } @@ -134,7 +134,7 @@ public void testInvalidShardCountSettings() throws Exception { .build()) .get(); fail("should have thrown an exception about the shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 1 or more primary shards"), equalTo(true)); assertThat("message contains error about shard count: " + e.getMessage(), @@ -160,7 +160,7 @@ public void testInvalidShardCountSettingsWithoutPrefix() throws Exception { .build()) .get(); fail("should have thrown an exception about the shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 1 or more primary shards"), equalTo(true)); } @@ -170,7 +170,7 @@ public void testInvalidShardCountSettingsWithoutPrefix() throws Exception { .build()) .get(); fail("should have thrown an exception about the shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 0 or more replica shards"), equalTo(true)); } @@ -181,7 +181,7 @@ public void testInvalidShardCountSettingsWithoutPrefix() throws Exception { .build()) .get(); fail("should have thrown an exception about the shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("index must have 1 or more primary shards"), equalTo(true)); assertThat("message contains error about shard count: " + e.getMessage(), diff --git a/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java index e09253ff2901c..8d864e313439c 100644 --- a/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java +++ b/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.action.index; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -40,7 +40,7 @@ public void testIndexRequestOpTypeFromString() throws Exception { assertThat(IndexRequest.OpType.fromString(indexUpper), equalTo(IndexRequest.OpType.INDEX)); } - @Test(expected= ElasticsearchIllegalArgumentException.class) + @Test(expected= IllegalArgumentException.class) public void testReadBogusString(){ String foobar = "foobar"; IndexRequest.OpType.fromString(foobar); diff --git a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java index 5c6f51c7ea19d..511f982272fa9 100644 --- a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java +++ b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.aliases; import org.apache.lucene.util.LuceneTestCase.Slow; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; @@ -112,7 +112,7 @@ public void testFailedFilter() throws Exception { try { indicesAliasesRequestBuilder.get(); fail("put alias should have been failed due to invalid filter"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [alias1]")); } @@ -121,7 +121,7 @@ public void testFailedFilter() throws Exception { try { indicesAliasesRequestBuilder.get(); fail("put alias should have been failed due to invalid filter"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [alias1]")); } } @@ -743,7 +743,7 @@ public void testAddAliasNullWithoutExistingIndices() { try { assertAcked(admin().indices().prepareAliases().addAliasAction(AliasAction.newAddAliasAction(null, "alias1"))); fail("create alias should have failed due to null index"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("Exception text does not contain \"Alias action [add]: [index] may not be empty string\"", e.getMessage(), containsString("Alias action [add]: [index] may not be empty string")); } @@ -760,7 +760,7 @@ public void testAddAliasNullWithExistingIndices() throws Exception { try { assertAcked(admin().indices().prepareAliases().addAlias((String) null, "empty-alias")); fail("create alias should have failed due to null index"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("Exception text does not contain \"Alias action [add]: [index] may not be empty string\"", e.getMessage(), containsString("Alias action [add]: [index] may not be empty string")); } @@ -904,7 +904,7 @@ public void testCreateIndexWithAliasesFilterNotValid() { try { createIndexRequestBuilder.get(); fail("create index should have failed due to invalid alias filter"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [alias2]")); } @@ -914,7 +914,7 @@ public void testCreateIndexWithAliasesFilterNotValid() { try { createIndexRequestBuilder.get(); fail("create index should have failed due to invalid alias filter"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [alias2]")); } } @@ -928,8 +928,8 @@ public void testAddAliasWithFilterNoMapping() throws Exception { .addAlias("test", "a", FilterBuilders.termFilter("field1", "term")) .get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { - assertThat(e.getRootCause(), instanceOf(QueryParsingException.class)); + } catch (IllegalArgumentException e) { + assertThat(e.getCause(), instanceOf(QueryParsingException.class)); } try { @@ -937,8 +937,8 @@ public void testAddAliasWithFilterNoMapping() throws Exception { .addAlias("test", "a", FilterBuilders.rangeFilter("field2").from(0).to(1)) .get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { - assertThat(e.getRootCause(), instanceOf(QueryParsingException.class)); + } catch (IllegalArgumentException e) { + assertThat(e.getCause(), instanceOf(QueryParsingException.class)); } client().admin().indices().prepareAliases() diff --git a/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java b/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java index beeebdac339ce..fa8b212101e8d 100644 --- a/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java +++ b/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java @@ -21,7 +21,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.index.Fields; import org.apache.lucene.util.English; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -393,7 +393,7 @@ public void testUnsupportedFeatures() throws IOException { setSettings(ImmutableSettings.builder().put("index.routing.allocation.exclude._name", backwardsCluster().newNodePattern()).put(indexSettings())) .addMapping("type", mapping)); } catch (MapperParsingException ex) { - assertThat(ex.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class)); assertThat(ExceptionsHelper.detailedMessage(ex).contains("type=_field_names is not supported on indices created before version 1.3.0"), equalTo(true)); } diff --git a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java index 16c49fb4c379b..a91d12fa3398a 100644 --- a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java +++ b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.test.ElasticsearchIntegrationTest; @@ -63,7 +63,7 @@ public void testUpdateSettingsValidation() throws Exception { try { client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put("index.refresh_interval", "")).execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { logger.info("Error message: [{}]", ex.getMessage()); } } diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java index 3349b33ed60ef..7aa06ea0c0616 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java @@ -21,7 +21,7 @@ import com.google.common.collect.Sets; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.metadata.IndexMetaData.State; @@ -426,14 +426,14 @@ public void testIndexOptions_singleIndexNoExpandWildcards() { try { md.concreteIndices(IndicesOptions.strictSingleIndexNoExpandForbidClosed(), "foofoobar"); fail(); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString("Alias [foofoobar] has more than one indices associated with it")); } try { md.concreteIndices(IndicesOptions.strictSingleIndexNoExpandForbidClosed(), "foo", "foofoobar"); fail(); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString("Alias [foofoobar] has more than one indices associated with it")); } @@ -656,7 +656,7 @@ private void checkCorrectException(MetaData metadata, IndicesOptions indicesOpti try { metadata.concreteIndices(indicesOptions, allIndices); fail("no wildcard expansion and null or empty list argument should trigger ElasticsearchIllegalArgumentException"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // expected } } else { diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index 2c04b470ff63b..1c38a22c52621 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.routing.allocation; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -129,14 +129,14 @@ public void allocateCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new AllocateAllocationCommand(new ShardId("test", 0), "node1", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> allocating to non-data node, should fail"); try { rerouteResult = allocation.reroute(clusterState, new AllocationCommands(new AllocateAllocationCommand(new ShardId("test", 0), "node4", true))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> allocating with primary flag set to true"); @@ -158,7 +158,7 @@ public void allocateCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new AllocateAllocationCommand(new ShardId("test", 0), "node1", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> allocate the replica shard on on the second node"); @@ -183,7 +183,7 @@ public void allocateCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new AllocateAllocationCommand(new ShardId("test", 0), "node3", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } } @@ -225,7 +225,7 @@ public void cancelCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new CancelAllocationCommand(new ShardId("test", 0), "node1", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> start the primary shard"); @@ -239,7 +239,7 @@ public void cancelCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new CancelAllocationCommand(new ShardId("test", 0), "node1", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> allocate the replica shard on on the second node"); @@ -273,7 +273,7 @@ public void cancelCommand() { try { allocation.reroute(clusterState, new AllocationCommands(new CancelAllocationCommand(new ShardId("test", 0), "node1", false))); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } logger.info("--> start the replica shard"); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index c298067b25060..2b782f92d2c0f 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -21,7 +21,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterInfo; import org.elasticsearch.cluster.ClusterInfoService; @@ -44,7 +44,6 @@ import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.test.ElasticsearchAllocationTestCase; -import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; import java.util.Arrays; @@ -787,7 +786,7 @@ public void addListener(Listener listener) { // throw an exception about not being able to complete strategy.reroute(clusterState, cmds).routingTable(); fail("should not have been able to reroute the shard"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("can't allocated because there isn't enough room: " + e.getMessage(), e.getMessage().contains("less than required [30.0%] free disk on node, free: [26.0%]"), equalTo(true)); } diff --git a/src/test/java/org/elasticsearch/common/BooleansTests.java b/src/test/java/org/elasticsearch/common/BooleansTests.java index 24058ac54381d..0869f3ba772c1 100644 --- a/src/test/java/org/elasticsearch/common/BooleansTests.java +++ b/src/test/java/org/elasticsearch/common/BooleansTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -78,7 +78,7 @@ public void parseBooleanExact() { Booleans.parseBooleanExact(randomFrom(null, "fred", "foo", "barney")); fail("Expected exception while parsing invalid boolean value "); } catch (Exception ex) { - assertTrue(ex instanceof ElasticsearchIllegalArgumentException); + assertTrue(ex instanceof IllegalArgumentException); } } diff --git a/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/src/test/java/org/elasticsearch/common/ParseFieldTests.java index ef4d2e093f658..8897e60e5d714 100644 --- a/src/test/java/org/elasticsearch/common/ParseFieldTests.java +++ b/src/test/java/org/elasticsearch/common/ParseFieldTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; import org.apache.commons.lang3.ArrayUtils; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; @@ -58,14 +58,14 @@ public void testParse() { try { withDeprecations.match(randomFrom(deprecated), flags); fail(); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } try { withDeprecations.match("barFoo", flags); fail(); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } } @@ -96,7 +96,7 @@ public void testAllDeprecated() { try { field.match(randomFrom(allValues), flags); fail(); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } } } diff --git a/src/test/java/org/elasticsearch/common/PidFileTests.java b/src/test/java/org/elasticsearch/common/PidFileTests.java index 0c66b411c600e..1593ffe512c2c 100644 --- a/src/test/java/org/elasticsearch/common/PidFileTests.java +++ b/src/test/java/org/elasticsearch/common/PidFileTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common; import com.google.common.base.Charsets; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; @@ -35,7 +35,7 @@ */ public class PidFileTests extends ElasticsearchTestCase { - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testParentIsFile() throws IOException { Path dir = createTempDir(); Path parent = dir.resolve("foo"); diff --git a/src/test/java/org/elasticsearch/common/TableTests.java b/src/test/java/org/elasticsearch/common/TableTests.java index 919e1c4dd51a4..d9c608881e614 100644 --- a/src/test/java/org/elasticsearch/common/TableTests.java +++ b/src/test/java/org/elasticsearch/common/TableTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; @@ -28,37 +28,37 @@ public class TableTests extends ElasticsearchTestCase { - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnStartRowWithoutHeader() { Table table = new Table(); table.startRow(); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnEndHeadersWithoutStart() { Table table = new Table(); table.endHeaders(); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnAddCellWithoutHeader() { Table table = new Table(); table.addCell("error"); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnAddCellWithoutRow() { Table table = this.getTableWithHeaders(); table.addCell("error"); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnEndRowWithoutStart() { Table table = this.getTableWithHeaders(); table.endRow(); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnLessCellsThanDeclared() { Table table = this.getTableWithHeaders(); table.startRow(); @@ -74,7 +74,7 @@ public void testOnLessCellsThanDeclaredUnchecked() { table.endRow(false); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailOnMoreCellsThanDeclared() { Table table = this.getTableWithHeaders(); table.startRow(); diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java index 077970941f3fb..66127c0618b2d 100644 --- a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java +++ b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.collect; import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.collect.ImmutableMap; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import java.util.HashMap; @@ -138,14 +138,14 @@ public void testUnsupportedValues() { try { new CopyOnWriteHashMap<>().copyAndPut("a", null); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // expected } try { new CopyOnWriteHashMap<>().copyAndPut(null, "b"); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // expected } } diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java index 86e4611c39866..8028781bda639 100644 --- a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java +++ b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.collect; import com.google.common.collect.ImmutableSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import java.util.HashSet; @@ -120,7 +120,7 @@ public void testUnsupportedValues() { try { new CopyOnWriteHashSet<>().copyAndAdd(null); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // expected } } diff --git a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java index 2c767d645bd3f..4da1582f090ee 100644 --- a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java +++ b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java @@ -27,7 +27,7 @@ import com.spatial4j.core.shape.jts.JtsGeometry; import com.spatial4j.core.shape.jts.JtsPoint; import com.vividsolutions.jts.geom.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -35,7 +35,6 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions; -import org.junit.Test; import java.io.IOException; import java.util.ArrayList; @@ -539,7 +538,7 @@ public void testParse_invalidPolygon() throws IOException { parser = JsonXContent.jsonXContent.createParser(invalidPoly); parser.nextToken(); - ElasticsearchGeoAssertions.assertValidException(parser, ElasticsearchIllegalArgumentException.class); + ElasticsearchGeoAssertions.assertValidException(parser, IllegalArgumentException.class); // test case 5: create an invalid polygon with 1 invalid LinearRing invalidPoly = XContentFactory.jsonBuilder().startObject().field("type", "polygon") @@ -550,7 +549,7 @@ public void testParse_invalidPolygon() throws IOException { parser = JsonXContent.jsonXContent.createParser(invalidPoly); parser.nextToken(); - ElasticsearchGeoAssertions.assertValidException(parser, ElasticsearchIllegalArgumentException.class); + ElasticsearchGeoAssertions.assertValidException(parser, IllegalArgumentException.class); // test case 6: create an invalid polygon with 0 LinearRings invalidPoly = XContentFactory.jsonBuilder().startObject().field("type", "polygon") diff --git a/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java b/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java index 524ae7367a66a..20c327410f813 100644 --- a/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java +++ b/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.recycler; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.recycler.Recycler.V; import org.elasticsearch.test.ElasticsearchTestCase; @@ -121,7 +121,7 @@ public void testDoubleRelease() { v1.close(); try { v1.close(); - } catch (ElasticsearchIllegalStateException e) { + } catch (IllegalStateException e) { // impl has protection against double release: ok return; } diff --git a/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java index e52b9f8ff8193..9bfc5af98f6de 100644 --- a/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.unit; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; @@ -63,7 +63,7 @@ public void testThatParsingWorks() { assertThat(SizeValue.parseSizeValue("1G").toString(), is(new SizeValue(1, SizeUnit.GIGA).toString())); } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testThatNegativeValuesThrowException() { new SizeValue(-1); } diff --git a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java b/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java index b276f5787a996..08ffca233a21c 100644 --- a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.discovery.zen; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNodes; @@ -75,7 +75,7 @@ public void testShouldIgnoreNewClusterState() { try { shouldIgnoreOrRejectNewClusterState(logger, currentState.build(), newState.build()); fail("should ignore, because current state's master is not equal to new state's master"); - } catch (ElasticsearchIllegalStateException e) { + } catch (IllegalStateException e) { assertThat(e.getMessage(), containsString("cluster state from a different master then the current one, rejecting")); } diff --git a/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java index 154a043c9966e..31045dcb451ec 100644 --- a/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java +++ b/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.ImmutableSettings; @@ -35,7 +35,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import java.util.Set; import java.util.concurrent.CountDownLatch; @@ -61,7 +60,7 @@ public void testNodeLockSingleEnvironment() throws IOException { try { new NodeEnvironment(settings, new Environment(settings)); fail("env is already locked"); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { } env.close(); diff --git a/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java b/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java index 491b281b9f94e..ef845b088859b 100644 --- a/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.fieldstats; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.action.fieldstats.FieldStatsResponse; @@ -193,7 +193,7 @@ public void testIncompatibleFieldTypes() { try { client().prepareFieldStats().setFields("value").get(); fail(); - } catch (ElasticsearchIllegalStateException e){ + } catch (IllegalStateException e){ assertThat(e.getMessage(), containsString("trying to merge the field stats of field [value]")); } diff --git a/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java b/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java index 12b699a989b99..1eb92f203da8a 100644 --- a/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java +++ b/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java @@ -21,7 +21,6 @@ import com.google.common.collect.Iterators; import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; @@ -29,9 +28,8 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.SimpleFSDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestRuleMarkFailure; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; @@ -44,10 +42,8 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.ElasticsearchTestCase; -import org.junit.Assert; import org.junit.Test; -import java.io.Closeable; import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; @@ -272,7 +268,7 @@ public void testLatestVersionDoesNotUseLegacy() throws IOException { try { format.loadLatestState(logger, dirs); fail("latest version can not be read"); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { assertThat(ex.getMessage(), startsWith("Could not find a state file to recover from among ")); } // write the next state file in the new format and ensure it get's a higher ID diff --git a/src/test/java/org/elasticsearch/get/GetActionTests.java b/src/test/java/org/elasticsearch/get/GetActionTests.java index 822ab88194ce1..94b83d9442479 100644 --- a/src/test/java/org/elasticsearch/get/GetActionTests.java +++ b/src/test/java/org/elasticsearch/get/GetActionTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.get; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.admin.indices.alias.Alias; @@ -785,7 +784,7 @@ public void testGetFields_nonLeafField() throws Exception { try { client().prepareGet(indexOrAlias(), "my-type1", "1").setFields("field1").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { //all well } @@ -794,7 +793,7 @@ public void testGetFields_nonLeafField() throws Exception { try { client().prepareGet(indexOrAlias(), "my-type1", "1").setFields("field1").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { //all well } } diff --git a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java index cd4ababaaf418..3db8c5039b78d 100644 --- a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.FailedToResolveConfigException; @@ -57,7 +57,7 @@ public void testLoadOverConfiguredSettings() { AnalysisTestsHelper.createAnalysisServiceFromSettings(settings); Assert.fail("path and array are configured"); } catch (Exception e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } } @@ -83,7 +83,7 @@ public void testKeepWordsPathSettings() { AnalysisTestsHelper.createAnalysisServiceFromSettings(settings); fail("expected an exception indicating that you can't use [keep_words_path] with [keep_words] "); } catch (Throwable e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } } diff --git a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java index 669613b4ebe2b..1500377fc18f8 100644 --- a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.*; import org.apache.lucene.analysis.reverse.ReverseStringFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings.Builder; @@ -58,7 +58,7 @@ public void testParseTokenChars() { try { new NGramTokenizerFactory(index, indexSettings, name, settings).create(); fail(); - } catch (ElasticsearchIllegalArgumentException expected) { + } catch (IllegalArgumentException expected) { // OK } } @@ -153,7 +153,7 @@ public void testBackwardsCompatibilityEdgeNgramTokenizer() throws Exception { try { new EdgeNGramTokenizerFactory(index, indexSettings, name, settings).create(); fail("should fail side:back is not supported anymore"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } } diff --git a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java index 09a3478d752d9..0aceb27bc02e0 100644 --- a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java @@ -19,12 +19,11 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; -import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.env.Environment; @@ -68,7 +67,7 @@ public void testPatternCaptureTokenFilter() throws Exception { } - @Test(expected=ElasticsearchIllegalArgumentException.class) + @Test(expected=IllegalArgumentException.class) public void testNoPatterns() { new PatternCaptureGroupTokenFilterFactory(new Index("test"), settingsBuilder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(), "pattern_capture", settingsBuilder().put("pattern", "foobar").build()); } diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java index 9947a9bd36dba..2e7e09f4ab9c8 100644 --- a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalysisService; @@ -46,7 +46,7 @@ public void testDefault() throws IOException { AnalysisTestsHelper.createAnalysisServiceFromSettings(settings); Assert.fail("[common_words] or [common_words_path] is set"); } catch (Exception e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } } @Test diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java b/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java index 8d3e7280c269b..b4f074498a3ca 100644 --- a/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java +++ b/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.engine; import org.apache.lucene.index.LiveIndexWriterConfig; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; @@ -108,7 +108,7 @@ public void testSettingsUpdate() { try { client().admin().indices().prepareUpdateSettings("foo").setSettings(settings).get(); fail("settings update didn't fail, but should have"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // good } @@ -118,7 +118,7 @@ public void testSettingsUpdate() { try { client().admin().indices().prepareUpdateSettings("foo").setSettings(settings).get(); fail("settings update didn't fail, but should have"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // good } @@ -128,7 +128,7 @@ public void testSettingsUpdate() { try { client().admin().indices().prepareUpdateSettings("foo").setSettings(settings).get(); fail("settings update didn't fail, but should have"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // good } } diff --git a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index 9036ed977369a..eda3d9fd9c84b 100644 --- a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.NumericRangeQuery; import org.apache.lucene.search.QueryWrapperFilter; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.LocaleUtils; @@ -110,7 +110,7 @@ public void testParseLocal() { try { LocaleUtils.parse("de_DE_DE_DE"); fail(); - } catch(ElasticsearchIllegalArgumentException ex) { + } catch(IllegalArgumentException ex) { // expected } assertThat(Locale.ROOT, equalTo(LocaleUtils.parse(""))); diff --git a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java index 94af55f7f3d17..f97bb8e7b80e3 100644 --- a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.mapper.ip; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; @@ -68,7 +68,7 @@ public void testThatInvalidIpThrowsException() throws Exception { try { IpFieldMapper.ipToLong("127.0.011.1111111"); fail("Expected ip address parsing to fail but did not happen"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), containsString("not a valid ip address")); } } @@ -78,7 +78,7 @@ public void testThatIpv6AddressThrowsException() throws Exception { try { IpFieldMapper.ipToLong("2001:db8:0:8d3:0:8a2e:70:7344"); fail("Expected ip address parsing to fail but did not happen"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), containsString("not a valid ipv4 address")); } } @@ -100,14 +100,14 @@ public void testIgnoreMalformedOption() throws Exception { try { defaultMapper.parse("type", "1", XContentFactory.jsonBuilder().startObject().field("field2", "").endObject().bytes()); } catch (MapperParsingException e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } // Verify that the default is false try { defaultMapper.parse("type", "1", XContentFactory.jsonBuilder().startObject().field("field3", "").endObject().bytes()); } catch (MapperParsingException e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } // Unless the global ignore_malformed option is set to true @@ -120,7 +120,7 @@ public void testIgnoreMalformedOption() throws Exception { try { defaultMapper.parse("type", "1", XContentFactory.jsonBuilder().startObject().field("field2", "").endObject().bytes()); } catch (MapperParsingException e) { - assertThat(e.getCause(), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); } } diff --git a/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java index a045f3bbb6e64..41c98311b8eb8 100644 --- a/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java +++ b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java @@ -20,10 +20,9 @@ import org.apache.lucene.index.LogByteSizeMergePolicy; import org.apache.lucene.index.LogDocMergePolicy; -import org.apache.lucene.index.TieredMergePolicy; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; @@ -94,19 +93,19 @@ public void testInvalidValue() throws IOException { try { new LogDocMergePolicyProvider(createStore(build(-0.1)), service).getMergePolicy().getNoCFSRatio(); fail("exception expected"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } try { new LogDocMergePolicyProvider(createStore(build(1.1)), service).getMergePolicy().getNoCFSRatio(); fail("exception expected"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } try { new LogDocMergePolicyProvider(createStore(build("Falsch")), service).getMergePolicy().getNoCFSRatio(); fail("exception expected"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index 3b8a3512aebf4..03ed89f4c792a 100644 --- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java +++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -64,7 +64,7 @@ import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.termvectors.MultiTermVectorsItemResponse; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; @@ -2411,8 +2411,8 @@ public void testProperErrorMessagesForMisplacedWeightsAndFunctions() throws IOEx try { functionScoreQuery().add(factorFunction(2.0f).setWeight(2.0f)); fail("Expect exception here because boost_factor must not have a weight"); - } catch (ElasticsearchIllegalArgumentException e) { - assertThat(e.getDetailedMessage(), containsString(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE)); + } catch (IllegalArgumentException e) { + assertThat(e.getMessage(), containsString(BoostScoreFunction.BOOST_WEIGHT_ERROR_MESSAGE)); } query = jsonBuilder().startObject().startObject("function_score") .startArray("functions") diff --git a/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java b/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java index 65727baed2b26..ad5b2b1d38928 100644 --- a/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java +++ b/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.search.child; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; @@ -57,9 +57,9 @@ public void noneFromString() { } /** - * Should throw {@link ElasticsearchIllegalArgumentException} instead of NPE. + * Should throw {@link IllegalArgumentException} instead of NPE. */ - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void nullFromString_throwsException() { ScoreType.fromString(null); } @@ -67,7 +67,7 @@ public void nullFromString_throwsException() { /** * Failure should not change (and the value should never match anything...). */ - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void unrecognizedFromString_throwsException() { ScoreType.fromString("unrecognized value"); } diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index d109e558bebc8..42761ca7a04ed 100644 --- a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -18,8 +18,8 @@ */ package org.elasticsearch.index.shard; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.ShardRouting; @@ -58,7 +58,7 @@ public void testFlushOnDeleteSetting() throws Exception { try { assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(settingsBuilder().put(IndexShard.INDEX_FLUSH_ON_CLOSE, "FOOBAR").build())); fail("exception expected"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { } assertEquals(newValue, shard.isFlushOnClose()); @@ -147,7 +147,7 @@ public void testDeleteShardState() throws IOException { try { shard.deleteShardState(); fail("shard is active metadata delete must fail"); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { // fine - only delete if non-active } diff --git a/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java index 39f48f8d63765..eed8769475df3 100644 --- a/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java +++ b/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.shard; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; @@ -52,7 +52,7 @@ public void testLoadShardPath() throws IOException { } } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailLoadShardPathOnMultiState() throws IOException { try (final NodeEnvironment env = newNodeEnvironment(settingsBuilder().build())) { ImmutableSettings.Builder builder = settingsBuilder().put(IndexMetaData.SETTING_UUID, "0xDEADBEEF"); @@ -66,7 +66,7 @@ public void testFailLoadShardPathOnMultiState() throws IOException { } } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testFailLoadShardPathIndexUUIDMissmatch() throws IOException { try (final NodeEnvironment env = newNodeEnvironment(settingsBuilder().build())) { ImmutableSettings.Builder builder = settingsBuilder().put(IndexMetaData.SETTING_UUID, "foobar"); diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java index 265155f74be74..c0dd7d1b834f1 100644 --- a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.indices; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequestBuilder; @@ -774,7 +774,7 @@ public void testUpdateSettings() throws Exception { assertAcked(client().admin().indices().prepareOpen("_all").get()); try { verify(client().admin().indices().prepareUpdateSettings("barbaz").setSettings(ImmutableSettings.builder().put("e", "f")), false); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("Can't update non dynamic settings[[index.e]] for open indices[[barbaz]]")); } verify(client().admin().indices().prepareUpdateSettings("baz*").setSettings(ImmutableSettings.builder().put("a", "b")), true); diff --git a/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java b/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java index 0488c02041ea5..67ca29e9461d6 100644 --- a/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java +++ b/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices; import org.apache.lucene.store.LockObtainFailedException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -74,7 +74,7 @@ public void testDeleteIndexStore() throws Exception { try { indicesService.deleteIndexStore("boom", firstMetaData, clusterService.state()); fail(); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { // all good } @@ -101,7 +101,7 @@ public void testDeleteIndexStore() throws Exception { try { indicesService.deleteIndexStore("boom", secondMetaData, clusterService.state()); fail(); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { // all good } @@ -111,7 +111,7 @@ public void testDeleteIndexStore() throws Exception { try { indicesService.deleteIndexStore("boom", firstMetaData, clusterService.state()); fail(); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { // all good } assertAcked(client().admin().indices().prepareOpen("test")); diff --git a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java index 7541de9132fa3..f65aeb64b2c88 100644 --- a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices.analyze; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; @@ -80,13 +80,13 @@ public void analyzeNumericField() throws ElasticsearchException, IOException { try { client().admin().indices().prepareAnalyze(indexOrAlias(), "123").setField("long").get(); fail("shouldn't get here"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { //all good } try { client().admin().indices().prepareAnalyze(indexOrAlias(), "123.0").setField("double").get(); fail("shouldn't get here"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { //all good } } @@ -235,7 +235,7 @@ public void testParseXContentForAnalyzeRequestWithInvalidJsonThrowsException() t RestAnalyzeAction.buildFromContent(invalidContent, analyzeRequest); fail("shouldn't get here"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), equalTo("Failed to parse request body")); } } @@ -254,7 +254,7 @@ public void testParseXContentForAnalyzeRequestWithUnknownParamThrowsException() RestAnalyzeAction.buildFromContent(invalidContent, analyzeRequest); fail("shouldn't get here"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), startsWith("Unknown parameter [unknown]")); } } diff --git a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java b/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java index e1b5c04368b7c..6b42cbad84b5a 100644 --- a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java +++ b/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.indices.recovery; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; @@ -344,7 +344,7 @@ public void testStageSequenceEnforcement() { state.setStage(stage); } fail("succeeded in performing the illegal sequence [" + Strings.arrayToCommaDelimitedString(stages) + "]"); - } catch (ElasticsearchIllegalStateException e) { + } catch (IllegalStateException e) { // cool } diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index c7e047265c00a..8653c16da3e76 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices.settings; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; @@ -278,7 +278,7 @@ public void testUpdateWithInvalidNumberOfReplicas() { ) .execute().actionGet(); fail("should have thrown an exception about the replica shard count"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat("message contains error about shard count: " + e.getMessage(), e.getMessage().contains("the value of the setting index.number_of_replicas must be a non negative integer"), equalTo(true)); } diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 0d00ea5291ecb..263a33940443f 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -23,7 +23,7 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; @@ -61,7 +61,7 @@ public void testOpenCloseUpdateSettings() throws Exception { ) .execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // all is well } diff --git a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java index 3d9e676d5450f..a4794649c8fb4 100644 --- a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java +++ b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.indices.state; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; @@ -54,35 +54,35 @@ public void testCloseAllRequiresName() { try { client().admin().indices().prepareClose("_all").execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } // Close all wildcard try { client().admin().indices().prepareClose("*").execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } // Close all wildcard try { client().admin().indices().prepareClose("test*").execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } // Close all wildcard try { client().admin().indices().prepareClose("*", "-test1").execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } // Close all wildcard try { client().admin().indices().prepareClose("*", "-test1", "+test1").execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } CloseIndexResponse closeIndexResponse = client().admin().indices().prepareClose("test3", "test2").execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java index 3d19218495b17..1d120ca9f7c80 100644 --- a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionRequestValidationException; @@ -33,7 +33,6 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.metadata.AliasMetaData; -import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; @@ -495,7 +494,7 @@ public void testAliasInvalidFilterValidJson() throws Exception { try { createIndex("test"); fail("index creation should have failed due to invalid alias filter in matching index template"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [invalid_alias]")); assertThat(e.getCause(), instanceOf(QueryParsingException.class)); assertThat(e.getCause().getMessage(), equalTo("No filter registered for [invalid]")); @@ -512,7 +511,7 @@ public void testAliasInvalidFilterInvalidJson() throws Exception { try { putIndexTemplateRequestBuilder.get(); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("failed to parse filter for alias [invalid_alias]")); } @@ -546,7 +545,7 @@ public void testAliasEmptyName() throws Exception { try { putIndexTemplateRequestBuilder.get(); fail("put template should have failed due to alias with empty name"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("alias name is required")); } } @@ -560,7 +559,7 @@ public void testAliasWithMultipleIndexRoutings() throws Exception { try { putIndexTemplateRequestBuilder.get(); fail("put template should have failed due to alias with multiple index routings"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), equalTo("alias [alias] has several index routing values associated with it")); } } @@ -661,7 +660,7 @@ public void testStrictAliasParsingInIndicesCreatedViaTemplates() throws Exceptio client().prepareIndex("d1", "test", "test").setSource("{}").get(); fail(); } catch (Exception e) { - assertThat(ExceptionsHelper.unwrapCause(e), instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(ExceptionsHelper.unwrapCause(e), instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), containsString("failed to parse filter for alias [alias4]")); } response = client().prepareBulk().add(new IndexRequest("d2", "test", "test").source("{}")).get(); diff --git a/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java b/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java index eda46721e3615..69dac24aa69cd 100644 --- a/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java @@ -19,11 +19,9 @@ package org.elasticsearch.operateAllIndices; -import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @@ -54,12 +52,14 @@ public void testDestructiveOperations() throws Exception { // should fail since index1 is the only index. client().admin().indices().prepareDelete("i*").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) {} + } catch (IllegalArgumentException e) { + } try { client().admin().indices().prepareDelete("_all").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) {} + } catch (IllegalArgumentException e) { + } settings = ImmutableSettings.builder() .put(DestructiveOperations.REQUIRES_NAME, false) @@ -85,20 +85,22 @@ public void testDestructiveOperations() throws Exception { try { client().admin().indices().prepareClose("_all").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) {} + } catch (IllegalArgumentException e) { + } try { assertAcked(client().admin().indices().prepareOpen("_all").get()); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } try { client().admin().indices().prepareClose("*").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) {} + } catch (IllegalArgumentException e) { + } try { assertAcked(client().admin().indices().prepareOpen("*").get()); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } settings = ImmutableSettings.builder() @@ -111,5 +113,4 @@ public void testDestructiveOperations() throws Exception { // end close index: client().admin().indices().prepareDelete("_all").get(); } - } diff --git a/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java b/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java index eaaa8c64cda9b..37fe6aa04febb 100644 --- a/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java +++ b/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java @@ -23,17 +23,15 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.info.PluginInfo; import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; -import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.test.ElasticsearchIntegrationTest; @@ -68,7 +66,7 @@ // if its in your classpath, then do not use plugins!!!!!! public class PluginManagerTests extends ElasticsearchIntegrationTest { - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testDownloadAndExtract_NullName_ThrowsException() throws IOException { pluginManager(getPluginUrlForResource("plugin_single_folder.zip")).downloadAndExtract(null); } @@ -480,12 +478,12 @@ public void testRemovePlugin() throws Exception { singlePluginInstallAndRemove("groupid/plugintest", getPluginUrlForResource("plugin_without_folders.zip")); } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testRemovePlugin_NullName_ThrowsException() throws IOException { pluginManager(getPluginUrlForResource("plugin_single_folder.zip")).removePlugin(null); } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testRemovePluginWithURLForm() throws Exception { PluginManager pluginManager = pluginManager(null); pluginManager.removePlugin("file://whatever"); @@ -510,7 +508,7 @@ private void runTestWithForbiddenName(String name) throws IOException { pluginManager(null).removePlugin(name); fail("this plugin name [" + name + "] should not be allowed"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // We expect that error } } diff --git a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java index 861fdf7b1af05..ef774983872da 100644 --- a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.routing; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Priority; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @@ -65,14 +65,14 @@ public void testResolveIndexRouting() throws Exception { try { clusterService().state().metaData().resolveIndexRouting("1", "alias10"); fail("should fail"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // all is well, we can't have two mappings, one provided, and one in the alias } try { clusterService().state().metaData().resolveIndexRouting(null, "alias0"); fail("should fail"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { // Expected } } diff --git a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java index bbbf8b875dc46..7041be12e36c6 100644 --- a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java +++ b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableSet; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; @@ -89,7 +89,7 @@ public void testCompileNonRegisteredPluginContext() { try { scriptService.compile(new Script(randomFrom(LANG_SET.toArray(new String[LANG_SET.size()])), "test", randomFrom(ScriptService.ScriptType.values()), null), new ScriptContext.Plugin("test", "unknown")); fail("script compilation should have been rejected"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString("script context [test_unknown] not supported")); } } @@ -105,7 +105,7 @@ public String getKey() { } }); fail("script compilation should have been rejected"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString("script context [test] not supported")); } } diff --git a/src/test/java/org/elasticsearch/script/IndexedScriptTests.java b/src/test/java/org/elasticsearch/script/IndexedScriptTests.java index 1064bf464c729..2eb881156bdd1 100644 --- a/src/test/java/org/elasticsearch/script/IndexedScriptTests.java +++ b/src/test/java/org/elasticsearch/script/IndexedScriptTests.java @@ -158,7 +158,7 @@ public void testAllOpsDisabledIndexedScripts() throws IOException { fail("update script should have been rejected"); } catch(Exception e) { assertThat(e.getMessage(), containsString("failed to execute script")); - assertThat(e.toString(), containsString("scripts of type [indexed], operation [update] and lang [expression] are disabled")); + assertThat(e.getCause().toString(), containsString("scripts of type [indexed], operation [update] and lang [expression] are disabled")); } try { String query = "{ \"script_fields\" : { \"test1\" : { \"script_id\" : \"script1\", \"lang\":\"expression\" }}}"; diff --git a/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java b/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java index bfc775e449a0a..ec28c3b90b04f 100644 --- a/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.script; import com.google.common.collect.Lists; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -36,7 +36,7 @@ public void testValidateCustomScriptContextsOperation() throws IOException { //try to register a prohibited script context new ScriptContextRegistry(Lists.newArrayList(new ScriptContext.Plugin("test", rejectedContext))); fail("ScriptContextRegistry initialization should have failed"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("[" + rejectedContext + "] is a reserved name, it cannot be registered as a custom script context")); } } @@ -49,18 +49,18 @@ public void testValidateCustomScriptContextsPluginName() throws IOException { //try to register a prohibited script context new ScriptContextRegistry(Lists.newArrayList(new ScriptContext.Plugin(rejectedContext, "test"))); fail("ScriptContextRegistry initialization should have failed"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("[" + rejectedContext + "] is a reserved name, it cannot be registered as a custom script context")); } } } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testValidateCustomScriptContextsEmptyPluginName() throws IOException { new ScriptContext.Plugin(randomBoolean() ? null : "", "test"); } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testValidateCustomScriptContextsEmptyOperation() throws IOException { new ScriptContext.Plugin("test", randomBoolean() ? null : ""); } @@ -71,7 +71,7 @@ public void testDuplicatedPluginScriptContexts() throws IOException { //try to register a prohibited script context new ScriptContextRegistry(Lists.newArrayList(new ScriptContext.Plugin("testplugin", "test"), new ScriptContext.Plugin("testplugin", "test"))); fail("ScriptContextRegistry initialization should have failed"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("script context [testplugin_test] cannot be registered twice")); } } diff --git a/src/test/java/org/elasticsearch/script/ScriptModesTests.java b/src/test/java/org/elasticsearch/script/ScriptModesTests.java index 119a5b911063d..96cc6fda02e87 100644 --- a/src/test/java/org/elasticsearch/script/ScriptModesTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptModesTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.script; import com.google.common.collect.*; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.script.ScriptService.ScriptType; @@ -106,7 +106,7 @@ public void testDefaultSettings() { assertScriptModesAllOps(ScriptMode.SANDBOX, ALL_LANGS, ScriptType.INDEXED, ScriptType.INLINE); } - @Test(expected = ElasticsearchIllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testMissingSetting() { assertAllSettingsWereChecked = false; this.scriptModes = new ScriptModes(scriptEngines, scriptContextRegistry, ImmutableSettings.EMPTY); diff --git a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java index 0493203e7a5b7..0be2f2a80b533 100644 --- a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.ImmutableSettings; @@ -116,7 +116,7 @@ public void testNotSupportedDisableDynamicSetting() throws IOException { try { buildScriptService(ImmutableSettings.builder().put(ScriptService.DISABLE_DYNAMIC_SCRIPTING_SETTING, randomUnicodeOfLength(randomIntBetween(1, 10))).build()); fail("script service should have thrown exception due to non supported script.disable_dynamic setting"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString(ScriptService.DISABLE_DYNAMIC_SCRIPTING_SETTING + " is not a supported setting, replace with fine-grained script settings")); } } @@ -144,7 +144,7 @@ public void testScriptsWithoutExtensions() throws IOException { try { scriptService.compile(new Script("test", "test_script", ScriptType.FILE, null), ScriptContext.Standard.SEARCH); fail("the script test_script should no longer exist"); - } catch (ElasticsearchIllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { assertThat(ex.getMessage(), containsString("Unable to find on disk script test_script")); } } @@ -351,7 +351,7 @@ public void testCompileNonRegisteredContext() throws IOException { try { scriptService.compile(new Script(type, "test", randomFrom(ScriptType.values()), null), new ScriptContext.Plugin(pluginName, unknownContext)); fail("script compilation should have been rejected"); - } catch(ElasticsearchIllegalArgumentException e) { + } catch(IllegalArgumentException e) { assertThat(e.getMessage(), containsString("script context [" + pluginName + "_" + unknownContext + "] not supported")); } } diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java index a5b38728a0f50..e4b226db3f02d 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.bucket.significant; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.InputStreamStreamInput; @@ -210,35 +210,35 @@ void testBackgroundAssertions(SignificanceHeuristic heuristicIsSuperset, Signifi try { heuristicIsSuperset.getScore(2, 3, 1, 4); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("subsetFreq > supersetFreq")); } try { heuristicIsSuperset.getScore(1, 4, 2, 3); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("subsetSize > supersetSize")); } try { heuristicIsSuperset.getScore(2, 1, 3, 4); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("subsetFreq > subsetSize")); } try { heuristicIsSuperset.getScore(1, 2, 4, 3); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("supersetFreq > supersetSize")); } try { heuristicIsSuperset.getScore(1, 3, 4, 4); fail(); - } catch (ElasticsearchIllegalArgumentException assertionError) { + } catch (IllegalArgumentException assertionError) { assertNotNull(assertionError.getMessage()); assertTrue(assertionError.getMessage().contains("supersetFreq - subsetFreq > supersetSize - subsetSize")); } @@ -248,21 +248,21 @@ void testBackgroundAssertions(SignificanceHeuristic heuristicIsSuperset, Signifi values[idx] *= -1; heuristicIsSuperset.getScore(values[0], values[1], values[2], values[3]); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("Frequencies of subset and superset must be positive")); } try { heuristicNotSuperset.getScore(2, 1, 3, 4); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("subsetFreq > subsetSize")); } try { heuristicNotSuperset.getScore(1, 2, 4, 3); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("supersetFreq > supersetSize")); } @@ -272,7 +272,7 @@ void testBackgroundAssertions(SignificanceHeuristic heuristicIsSuperset, Signifi values[idx] *= -1; heuristicNotSuperset.getScore(values[0], values[1], values[2], values[3]); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("Frequencies of subset and superset must be positive")); } @@ -285,21 +285,21 @@ void testAssertions(SignificanceHeuristic heuristic) { values[idx] *= -1; heuristic.getScore(values[0], values[1], values[2], values[3]); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("Frequencies of subset and superset must be positive")); } try { heuristic.getScore(1, 2, 4, 3); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("supersetFreq > supersetSize")); } try { heuristic.getScore(2, 1, 3, 4); fail(); - } catch (ElasticsearchIllegalArgumentException illegalArgumentException) { + } catch (IllegalArgumentException illegalArgumentException) { assertNotNull(illegalArgumentException.getMessage()); assertTrue(illegalArgumentException.getMessage().contains("subsetFreq > subsetSize")); } @@ -339,7 +339,7 @@ public void basicScoreProperties(SignificanceHeuristic heuristic, boolean test0) long c = randomLong(); long d = randomLong(); score = heuristic.getScore(a, b, c, d); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } assertThat(score, greaterThanOrEqualTo(0.0)); } @@ -362,7 +362,7 @@ public void scoreMutual() throws Exception { long c = randomLong(); long d = randomLong(); score = heuristic.getScore(a, b, c, d); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } assertThat(score, lessThanOrEqualTo(1.0)); assertThat(score, greaterThanOrEqualTo(0.0)); diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index a3139e507a622..d2f2a90544009 100644 --- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -20,7 +20,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -1467,13 +1467,13 @@ public void indexChildDocWithNoParentMapping() throws ElasticsearchException, IO try { client().prepareIndex("test", "child1", "c1").setParent("p1").setSource("c_field", "blue").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.toString(), containsString("Can't specify parent if no parent field has been configured")); } try { client().prepareIndex("test", "child2", "c2").setParent("p1").setSource("c_field", "blue").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.toString(), containsString("Can't specify parent if no parent field has been configured")); } diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index 315442a00227e..50e693c2c3e2a 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -19,15 +19,13 @@ package org.elasticsearch.search.functionscore; -import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.ElasticsearchIllegalStateException; -import org.elasticsearch.ElasticsearchParseException; +import java.lang.IllegalArgumentException; +import java.lang.IllegalStateException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.lucene.search.function.CombineFunction; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -469,7 +467,7 @@ public void testParseDateMath() throws Exception { } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testExceptionThrownIfScaleRefNotBetween0And1() throws Exception { DecayFunctionBuilder gfb = new GaussDecayFunctionBuilder("num1", "2013-05-28", "1d").setDecay(100); } @@ -916,17 +914,17 @@ public void testMissingFunctionThrowsElasticsearchParseException() throws IOExce // next test java client try { client().prepareSearch("t").setQuery(QueryBuilders.functionScoreQuery(FilterBuilders.matchAllFilter(), null)).get(); - } catch (ElasticsearchIllegalArgumentException failure) { + } catch (IllegalArgumentException failure) { assertTrue(failure.toString().contains("function must not be null")); } try { client().prepareSearch("t").setQuery(QueryBuilders.functionScoreQuery().add(FilterBuilders.matchAllFilter(), null)).get(); - } catch (ElasticsearchIllegalArgumentException failure) { + } catch (IllegalArgumentException failure) { assertTrue(failure.toString().contains("function must not be null")); } try { client().prepareSearch("t").setQuery(QueryBuilders.functionScoreQuery().add(null)).get(); - } catch (ElasticsearchIllegalArgumentException failure) { + } catch (IllegalArgumentException failure) { assertTrue(failure.toString().contains("function must not be null")); } } diff --git a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java index e3215ddd2b455..c1d8e32c51766 100644 --- a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java +++ b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java @@ -19,10 +19,9 @@ package org.elasticsearch.search.preference; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.test.ElasticsearchIntegrationTest; @@ -112,7 +111,7 @@ public void simplePreferenceTests() throws Exception { assertThat(searchResponse.getHits().totalHits(), equalTo(1l)); } - @Test (expected = ElasticsearchIllegalArgumentException.class) + @Test (expected = IllegalArgumentException.class) public void testThatSpecifyingNonExistingNodesReturnsUsefulError() throws Exception { createIndex("test"); ensureGreen(); diff --git a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java index d23d4da71acbd..f16a6d2907c4b 100644 --- a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java +++ b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.scroll; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Priority; @@ -319,13 +319,13 @@ public void testClearIllegalScrollId() throws Exception { try { client().prepareClearScroll().addScrollId("c2Nhbjs2OzM0NDg1ODpzRlBLc0FXNlNyNm5JWUc1").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } try { // Fails during base64 decoding (Base64-encoded string must have at least four characters) client().prepareClearScroll().addScrollId("a").get(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } try { client().prepareClearScroll().addScrollId("abcabc").get(); @@ -513,7 +513,7 @@ public void testParseSearchScrollRequestWithInvalidJsonThrowsException() throws RestSearchScrollAction.buildFromContent(invalidContent, searchScrollRequest); fail("expected parseContent failure"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), equalTo("Failed to parse request body")); } } @@ -530,7 +530,7 @@ public void testParseSearchScrollRequestWithUnknownParamThrowsException() throws RestSearchScrollAction.buildFromContent(invalidContent, searchScrollRequest); fail("expected parseContent failure"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), startsWith("Unknown parameter [unknown]")); } } @@ -555,7 +555,7 @@ public void testParseClearScrollRequestWithInvalidJsonThrowsException() throws E RestClearScrollAction.buildFromContent(invalidContent, clearScrollRequest); fail("expected parseContent failure"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), equalTo("Failed to parse request body")); } } @@ -572,7 +572,7 @@ public void testParseClearScrollRequestWithUnknownParamThrowsException() throws RestClearScrollAction.buildFromContent(invalidContent, clearScrollRequest); fail("expected parseContent failure"); } catch (Exception e) { - assertThat(e, instanceOf(ElasticsearchIllegalArgumentException.class)); + assertThat(e, instanceOf(IllegalArgumentException.class)); assertThat(e.getMessage(), startsWith("Unknown parameter [unknown]")); } } diff --git a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java index f4a2e81df613c..5911985cc26b5 100644 --- a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java +++ b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java @@ -19,15 +19,13 @@ package org.elasticsearch.search.simple; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; import java.util.ArrayList; @@ -49,14 +47,14 @@ public void testSearchNullIndex() { try { client().prepareSearch((String) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } try { client().prepareSearch((String[]) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).execute().actionGet(); fail(); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { } } diff --git a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java index b3d8eeeb9bce5..336903e67f170 100644 --- a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java @@ -20,15 +20,13 @@ import com.google.common.collect.Sets; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.suggest.SuggestRequest; import org.elasticsearch.action.suggest.SuggestRequestBuilder; import org.elasticsearch.action.suggest.SuggestResponse; -import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; -import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperParsingException; @@ -602,7 +600,7 @@ public void testThatMissingPrefixesForContextReturnException() throws Exception try { index(INDEX, "service", "2", jsonBuilder().startObject().startObject("suggest").field("input", "backback").endObject().endObject()); fail("index operation was not supposed to be successful"); - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { assertThat(e.getMessage(), containsString("one or more prefixes needed")); } } diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java index 6f512a29c8185..47802e9d848a8 100644 --- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java @@ -19,13 +19,11 @@ package org.elasticsearch.search.suggest; -import com.carrotsearch.randomizedtesting.annotations.Nightly; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; -import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.*; @@ -124,11 +122,11 @@ public void testSuggestAcrossMultipleIndices() throws IOException { searchSuggest( termSuggest); fail(" can not suggest across multiple indices with different analysis chains"); } catch (ReduceSearchPhaseException ex) { - assertThat(ex.getCause(), instanceOf(ElasticsearchIllegalStateException.class)); + assertThat(ex.getCause(), instanceOf(IllegalStateException.class)); assertThat(ex.getCause().getMessage(), anyOf(endsWith("Suggest entries have different sizes actual [1] expected [2]"), endsWith("Suggest entries have different sizes actual [2] expected [1]"))); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { assertThat(ex.getMessage(), anyOf(endsWith("Suggest entries have different sizes actual [1] expected [2]"), endsWith("Suggest entries have different sizes actual [2] expected [1]"))); } @@ -144,10 +142,10 @@ public void testSuggestAcrossMultipleIndices() throws IOException { searchSuggest( termSuggest); fail(" can not suggest across multiple indices with different analysis chains"); } catch (ReduceSearchPhaseException ex) { - assertThat(ex.getCause(), instanceOf(ElasticsearchIllegalStateException.class)); + assertThat(ex.getCause(), instanceOf(IllegalStateException.class)); assertThat(ex.getCause().getMessage(), anyOf(endsWith("Suggest entries have different text actual [ABCD] expected [abcd]"), endsWith("Suggest entries have different text actual [abcd] expected [ABCD]"))); - } catch (ElasticsearchIllegalStateException ex) { + } catch (IllegalStateException ex) { assertThat(ex.getMessage(), anyOf(endsWith("Suggest entries have different text actual [ABCD] expected [abcd]"), endsWith("Suggest entries have different text actual [abcd] expected [ABCD]"))); } diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java index b24d74b84b260..a3abd47e91368 100644 --- a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java +++ b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java @@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase.Slow; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ListenableActionFuture; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; @@ -1646,7 +1646,7 @@ public void changeSettingsOnRestoreTest() throws Exception { .prepareRestoreSnapshot("test-repo", "test-snap") .setIgnoreIndexSettings("index.analysis.*") .setIndexSettings(newIncorrectReplicasIndexSettings) - .setWaitForCompletion(true), ElasticsearchIllegalArgumentException.class); + .setWaitForCompletion(true), IllegalArgumentException.class); logger.info("--> restore index with correct settings from the snapshot"); RestoreSnapshotResponse restoreSnapshotResponse = client.admin().cluster() diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java index 70bc6b99c1158..9777b57e3bf68 100644 --- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java +++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java @@ -38,7 +38,7 @@ import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; @@ -132,7 +132,6 @@ import static junit.framework.Assert.fail; import static org.apache.lucene.util.LuceneTestCase.TEST_NIGHTLY; -import static org.apache.lucene.util.LuceneTestCase.random; import static org.apache.lucene.util.LuceneTestCase.rarely; import static org.apache.lucene.util.LuceneTestCase.usually; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -365,7 +364,7 @@ private Settings getSettings(int nodeOrdinal, long nodeSeed, Settings others) { Settings settings = settingsSource.node(nodeOrdinal); if (settings != null) { if (settings.get(ClusterName.SETTING) != null) { - throw new ElasticsearchIllegalStateException("Tests must not set a '" + ClusterName.SETTING + "' as a node setting set '" + ClusterName.SETTING + "': [" + settings.get(ClusterName.SETTING) + "]"); + throw new IllegalStateException("Tests must not set a '" + ClusterName.SETTING + "' as a node setting set '" + ClusterName.SETTING + "': [" + settings.get(ClusterName.SETTING) + "]"); } builder.put(settings); } diff --git a/src/test/java/org/elasticsearch/test/TestCluster.java b/src/test/java/org/elasticsearch/test/TestCluster.java index d96dd084b3d34..e6b5967f2c95f 100644 --- a/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/src/test/java/org/elasticsearch/test/TestCluster.java @@ -20,7 +20,7 @@ package org.elasticsearch.test; import com.carrotsearch.hppc.ObjectArrayList; -import org.elasticsearch.ElasticsearchIllegalArgumentException; +import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -132,7 +132,7 @@ public void wipeIndices(String... indices) { assertAcked(client().admin().indices().prepareDelete(indices)); } catch (IndexMissingException e) { // ignore - } catch (ElasticsearchIllegalArgumentException e) { + } catch (IllegalArgumentException e) { // Happens if `action.destructive_requires_name` is set to true // which is the case in the CloseIndexDisableCloseAllTests if ("_all".equals(indices[0])) { diff --git a/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java b/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java index 69b3cee96d40d..5c60459285309 100644 --- a/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java +++ b/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.cluster; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlock; @@ -67,12 +67,12 @@ public ClusterState state() { } @Override - public void addInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void addInitialStateBlock(ClusterBlock block) throws IllegalStateException { } @Override - public void removeInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException { } diff --git a/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java b/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java index 27f09489763d7..22e6f2eecdf0b 100644 --- a/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java +++ b/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.cluster; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlock; @@ -107,13 +107,13 @@ public ClusterState state() { } @Override - public void addInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void addInitialStateBlock(ClusterBlock block) throws IllegalStateException { throw new UnsupportedOperationException(); } @Override - public void removeInitialStateBlock(ClusterBlock block) throws ElasticsearchIllegalStateException { + public void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException { throw new UnsupportedOperationException(); } diff --git a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java index d8be9b704c63f..ee845d2199c8a 100644 --- a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java +++ b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport.netty; -import org.elasticsearch.ElasticsearchIllegalStateException; +import java.lang.IllegalStateException; import org.elasticsearch.common.util.concurrent.KeyedLock; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; @@ -75,7 +75,7 @@ public void checkIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedExc } } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void checkCannotAcquireTwoLocksGlobal() throws InterruptedException { KeyedLock.GlobalLockable connectionLock = new KeyedLock.GlobalLockable<>(); String name = randomRealisticUnicodeOfLength(scaledRandomIntBetween(10, 50)); @@ -89,7 +89,7 @@ public void checkCannotAcquireTwoLocksGlobal() throws InterruptedException { } } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void checkCannotAcquireTwoLocks() throws InterruptedException { KeyedLock connectionLock = randomBoolean() ? new KeyedLock.GlobalLockable() : new KeyedLock(); String name = randomRealisticUnicodeOfLength(scaledRandomIntBetween(10, 50)); @@ -97,7 +97,7 @@ public void checkCannotAcquireTwoLocks() throws InterruptedException { connectionLock.acquire(name); } - @Test(expected = ElasticsearchIllegalStateException.class) + @Test(expected = IllegalStateException.class) public void checkCannotReleaseUnacquiredLock() throws InterruptedException { KeyedLock connectionLock = randomBoolean() ? new KeyedLock.GlobalLockable() : new KeyedLock(); String name = randomRealisticUnicodeOfLength(scaledRandomIntBetween(10, 50)); From b4efb6c472715756f9920a653be70d3ce16767cc Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Wed, 29 Apr 2015 10:08:50 +0200 Subject: [PATCH 2/2] Remove unused / obsolete import and throws statements This commit removes unused thorws statements when RuntimeExceptions are mentioned in the throws statement. It also removes obsolete import statements for java.lang.IllegalArgumentException and java.lang.IllegalStateException --- .../lucene/analysis/PrefixAnalyzer.java | 1 - .../lucene/store/StoreRateLimiting.java | 5 +-- .../elasticsearch/action/ActionFuture.java | 10 ++--- .../action/ActionRequestBuilder.java | 6 +-- .../ActionRequestValidationException.java | 1 - .../elasticsearch/action/ThreadingModel.java | 1 - .../action/WriteConsistencyLevel.java | 1 - .../cluster/health/ClusterHealthStatus.java | 1 - .../health/TransportClusterHealthAction.java | 3 +- .../TransportNodesHotThreadsAction.java | 2 +- .../node/info/TransportNodesInfoAction.java | 2 +- .../node/stats/TransportNodesStatsAction.java | 2 +- .../TransportDeleteRepositoryAction.java | 2 +- .../get/TransportGetRepositoriesAction.java | 2 +- .../put/PutRepositoryRequest.java | 1 - .../put/TransportPutRepositoryAction.java | 2 +- .../TransportVerifyRepositoryAction.java | 2 +- .../TransportClusterRerouteAction.java | 2 +- .../TransportClusterUpdateSettingsAction.java | 2 +- .../shards/ClusterSearchShardsRequest.java | 1 - .../TransportClusterSearchShardsAction.java | 2 +- .../create/CreateSnapshotRequest.java | 1 - .../create/TransportCreateSnapshotAction.java | 2 +- .../delete/TransportDeleteSnapshotAction.java | 2 +- .../get/TransportGetSnapshotsAction.java | 2 +- .../restore/RestoreSnapshotRequest.java | 1 - .../TransportRestoreSnapshotAction.java | 2 +- .../status/SnapshotIndexShardStage.java | 1 - .../status/SnapshotIndexShardStatus.java | 1 - .../snapshots/status/SnapshotShardsStats.java | 1 - .../status/TransportNodesSnapshotsStatus.java | 2 +- .../TransportSnapshotsStatusAction.java | 1 - .../state/TransportClusterStateAction.java | 2 +- .../stats/TransportClusterStatsAction.java | 2 +- .../TransportPendingClusterTasksAction.java | 2 +- .../action/admin/indices/alias/Alias.java | 1 - .../alias/TransportIndicesAliasesAction.java | 2 +- .../exists/TransportAliasesExistAction.java | 2 +- .../alias/get/TransportGetAliasesAction.java | 2 +- .../analyze/TransportAnalyzeAction.java | 3 +- .../TransportClearIndicesCacheAction.java | 2 +- .../close/TransportCloseIndexAction.java | 2 +- .../indices/create/CreateIndexRequest.java | 1 - .../create/TransportCreateIndexAction.java | 2 +- .../delete/TransportDeleteIndexAction.java | 2 +- .../indices/TransportIndicesExistsAction.java | 2 +- .../types/TransportTypesExistsAction.java | 2 +- .../indices/flush/TransportFlushAction.java | 2 +- .../admin/indices/get/GetIndexRequest.java | 5 +-- .../indices/get/TransportGetIndexAction.java | 3 +- .../TransportGetFieldMappingsIndexAction.java | 4 +- .../get/TransportGetMappingsAction.java | 2 +- .../mapping/put/PutMappingRequest.java | 1 - .../put/TransportPutMappingAction.java | 2 +- .../open/TransportOpenIndexAction.java | 2 +- .../optimize/TransportOptimizeAction.java | 2 +- .../recovery/TransportRecoveryAction.java | 2 +- .../refresh/TransportRefreshAction.java | 2 +- .../TransportIndicesSegmentsAction.java | 2 +- .../get/TransportGetSettingsAction.java | 2 +- .../put/TransportUpdateSettingsAction.java | 2 +- .../stats/TransportIndicesStatsAction.java | 2 +- .../TransportDeleteIndexTemplateAction.java | 2 +- .../get/TransportGetIndexTemplatesAction.java | 2 +- .../template/put/PutIndexTemplateRequest.java | 1 - .../put/TransportPutIndexTemplateAction.java | 2 +- .../query/TransportValidateQueryAction.java | 2 +- .../delete/TransportDeleteWarmerAction.java | 2 +- .../warmer/get/TransportGetWarmersAction.java | 2 +- .../warmer/put/TransportPutWarmerAction.java | 2 +- .../action/bulk/BulkProcessor.java | 1 - .../action/bulk/BulkRequest.java | 1 - .../action/bulk/TransportShardBulkAction.java | 1 - .../action/count/CountRequest.java | 1 - .../action/count/TransportCountAction.java | 2 +- .../action/delete/TransportDeleteAction.java | 1 - .../action/exists/TransportExistsAction.java | 2 +- .../explain/TransportExplainAction.java | 4 +- .../TransportFieldStatsTransportAction.java | 4 +- .../action/get/MultiGetRequest.java | 1 - .../action/get/TransportGetAction.java | 2 +- .../get/TransportShardMultiGetAction.java | 2 +- .../action/index/IndexRequest.java | 7 ++-- .../action/mlt/MoreLikeThisRequest.java | 3 +- .../mlt/MoreLikeThisRequestBuilder.java | 3 +- .../mlt/TransportMoreLikeThisAction.java | 1 - .../percolate/MultiPercolateRequest.java | 1 - .../percolate/TransportPercolateAction.java | 2 +- .../TransportShardMultiPercolateAction.java | 4 +- .../action/search/MultiSearchRequest.java | 1 - .../action/search/SearchRequest.java | 3 +- .../action/search/SearchRequestBuilder.java | 3 +- .../action/search/SearchType.java | 3 +- .../action/search/TransportSearchAction.java | 1 - .../search/TransportSearchScrollAction.java | 1 - .../search/type/TransportSearchHelper.java | 2 - .../type/TransportSearchTypeAction.java | 1 - .../suggest/TransportSuggestAction.java | 3 +- .../action/support/AdapterActionFuture.java | 11 +++--- .../action/support/DestructiveOperations.java | 1 - .../action/support/IndicesOptions.java | 1 - .../action/support/TransportAction.java | 2 +- .../TransportBroadcastOperationAction.java | 2 +- .../info/TransportClusterInfoAction.java | 4 +- .../nodes/TransportNodesOperationAction.java | 2 +- ...nsportShardReplicationOperationAction.java | 2 +- .../TransportSingleCustomOperationAction.java | 2 +- ...ransportInstanceSingleOperationAction.java | 6 +-- .../TransportShardSingleOperationAction.java | 4 +- .../termvectors/MultiTermVectorsRequest.java | 1 - .../termvectors/TermVectorsResponse.java | 1 - .../TransportShardMultiTermsVectorAction.java | 2 +- .../TransportTermVectorsAction.java | 2 +- .../dfs/TransportDfsOnlyAction.java | 2 +- .../action/update/TransportUpdateAction.java | 7 ++-- .../action/update/UpdateHelper.java | 1 - .../cache/recycler/PageCacheRecycler.java | 1 - .../client/transport/TransportClient.java | 6 +-- .../TransportClientNodesService.java | 3 +- .../elasticsearch/cluster/ClusterService.java | 1 - .../elasticsearch/cluster/ClusterState.java | 3 +- .../action/index/MappingUpdatedAction.java | 3 +- .../action/index/NodeIndexDeletedAction.java | 2 +- .../index/NodeMappingRefreshAction.java | 2 +- .../action/shard/ShardStateAction.java | 8 ++-- .../cluster/block/ClusterBlockLevel.java | 1 - .../cluster/metadata/AliasAction.java | 1 - .../cluster/metadata/AliasValidator.java | 1 - .../cluster/metadata/IndexMetaData.java | 4 +- .../cluster/metadata/MappingMetaData.java | 1 - .../cluster/metadata/MetaData.java | 3 +- .../metadata/MetaDataCreateIndexService.java | 5 +-- .../metadata/MetaDataIndexStateService.java | 1 - .../MetaDataIndexTemplateService.java | 3 +- .../MetaDataUpdateSettingsService.java | 1 - .../cluster/metadata/RestoreMetaData.java | 1 - .../cluster/metadata/SnapshotMetaData.java | 1 - .../cluster/node/DiscoveryNode.java | 1 - .../cluster/node/DiscoveryNodes.java | 1 - .../cluster/routing/IndexRoutingTable.java | 1 - .../cluster/routing/OperationRouting.java | 1 - .../cluster/routing/Preference.java | 1 - .../cluster/routing/RoutingNode.java | 1 - .../cluster/routing/RoutingService.java | 6 +-- .../cluster/routing/ShardRoutingState.java | 1 - .../routing/allocation/AllocationService.java | 3 +- .../allocator/BalancedShardsAllocator.java | 1 - .../command/AllocateAllocationCommand.java | 4 +- .../allocation/command/AllocationCommand.java | 2 +- .../command/AllocationCommands.java | 6 +-- .../command/CancelAllocationCommand.java | 3 +- .../command/MoveAllocationCommand.java | 3 +- .../ClusterRebalanceAllocationDecider.java | 2 - .../routing/allocation/decider/Decision.java | 1 - .../decider/EnableAllocationDecider.java | 2 - .../service/InternalClusterService.java | 9 ++--- .../org/elasticsearch/common/Booleans.java | 1 - .../org/elasticsearch/common/ParseField.java | 1 - .../org/elasticsearch/common/PidFile.java | 1 - .../elasticsearch/common/Preconditions.java | 2 - .../org/elasticsearch/common/Priority.java | 1 - .../common/RandomBasedUUIDGenerator.java | 1 - .../java/org/elasticsearch/common/Table.java | 1 - .../common/TimeBasedUUIDGenerator.java | 1 - .../common/breaker/CircuitBreaker.java | 1 - .../common/bytes/BytesArray.java | 1 - .../common/bytes/PagedBytesReference.java | 1 - .../bytes/ReleasablePagedBytesReference.java | 2 +- .../org/elasticsearch/common/cli/CliTool.java | 1 - .../common/collect/HppcMaps.java | 1 - .../component/AbstractLifecycleComponent.java | 12 +++--- .../common/component/Lifecycle.java | 1 - .../common/component/LifecycleComponent.java | 4 +- .../elasticsearch/common/geo/GeoDistance.java | 1 - .../common/geo/GeoHashUtils.java | 3 +- .../common/geo/builders/ShapeBuilder.java | 1 - .../common/lease/Releasable.java | 2 +- .../common/lease/Releasables.java | 4 +- .../elasticsearch/common/lucene/Lucene.java | 2 - .../common/lucene/all/AllEntries.java | 1 - .../common/lucene/docset/DocIdSets.java | 2 - .../lucene/index/FilterableTermsEnum.java | 3 +- .../common/lucene/index/FreqTermsEnum.java | 2 +- .../search/function/WeightFactorFunction.java | 1 - .../common/recycler/DequeRecycler.java | 1 - .../common/recycler/NoneRecycler.java | 1 - .../common/recycler/Recyclers.java | 3 +- .../org/elasticsearch/common/regex/Regex.java | 1 - .../common/rounding/TimeZoneRounding.java | 1 - .../common/settings/ImmutableSettings.java | 1 - .../TransportAddressSerializers.java | 1 - .../common/unit/ByteSizeValue.java | 5 +-- .../common/unit/DistanceUnit.java | 1 - .../elasticsearch/common/unit/Fuzziness.java | 1 - .../common/util/BloomFilter.java | 1 - .../common/util/LocaleUtils.java | 1 - .../common/util/LongObjectPagedHashMap.java | 2 +- .../common/util/MultiDataPathUpgrader.java | 1 - .../common/util/concurrent/CountDown.java | 1 - .../common/util/concurrent/EsAbortPolicy.java | 1 - .../util/concurrent/EsThreadPoolExecutor.java | 1 - .../common/util/concurrent/KeyedLock.java | 1 - .../util/concurrent/SizeBlockingQueue.java | 1 - .../common/xcontent/XContentFactory.java | 1 - .../xcontent/json/JsonXContentParser.java | 1 - .../discovery/DiscoveryService.java | 6 +-- .../discovery/DiscoverySettings.java | 1 - .../discovery/local/LocalDiscovery.java | 7 ++-- .../discovery/zen/NotMasterException.java | 1 - .../discovery/zen/ZenDiscovery.java | 8 ++-- .../zen/fd/MasterFaultDetection.java | 1 - .../discovery/zen/fd/NodesFaultDetection.java | 1 - .../zen/membership/MembershipAction.java | 6 +-- .../discovery/zen/ping/ZenPing.java | 2 +- .../discovery/zen/ping/ZenPingService.java | 9 ++--- .../zen/ping/multicast/MulticastZenPing.java | 7 ++-- .../zen/ping/unicast/UnicastZenPing.java | 10 ++--- .../elasticsearch/env/NodeEnvironment.java | 2 - .../gateway/GatewayMetaState.java | 1 - .../elasticsearch/gateway/GatewayService.java | 6 +-- .../gateway/MetaDataStateFormat.java | 1 - .../TransportNodesListGatewayMetaState.java | 2 +- ...ransportNodesListGatewayStartedShards.java | 2 +- .../org/elasticsearch/http/HttpServer.java | 6 +-- .../http/netty/NettyHttpServerTransport.java | 6 +-- .../org/elasticsearch/index/IndexService.java | 5 +-- .../org/elasticsearch/index/VersionType.java | 1 - .../index/analysis/Analysis.java | 1 - .../index/analysis/AnalysisModule.java | 1 - .../index/analysis/AnalysisService.java | 1 - .../CommonGramsTokenFilterFactory.java | 1 - .../analysis/EdgeNGramTokenizerFactory.java | 3 +- .../analysis/HunspellTokenFilterFactory.java | 1 - .../analysis/KeepTypesFilterFactory.java | 1 - .../index/analysis/KeepWordFilterFactory.java | 1 - .../KeywordMarkerTokenFilterFactory.java | 1 - .../analysis/LengthTokenFilterFactory.java | 1 - .../analysis/LowerCaseTokenFilterFactory.java | 1 - .../analysis/MappingCharFilterFactory.java | 1 - .../index/analysis/NGramTokenizerFactory.java | 3 +- .../PathHierarchyTokenizerFactory.java | 1 - .../analysis/PatternAnalyzerProvider.java | 1 - ...PatternCaptureGroupTokenFilterFactory.java | 1 - .../PatternReplaceCharFilterFactory.java | 1 - .../PatternReplaceTokenFilterFactory.java | 3 +- .../analysis/PatternTokenizerFactory.java | 3 +- .../StemmerOverrideTokenFilterFactory.java | 1 - .../analysis/StopTokenFilterFactory.java | 1 - .../analysis/SynonymTokenFilterFactory.java | 1 - .../analysis/TrimTokenFilterFactory.java | 1 - .../analysis/TruncateTokenFilterFactory.java | 1 - ...bstractCompoundWordTokenFilterFactory.java | 3 +- ...enationCompoundWordTokenFilterFactory.java | 3 +- .../index/cache/bitset/BitsetFilterCache.java | 2 +- .../filter/weighted/WeightedFilterCache.java | 2 +- .../index/codec/CodecService.java | 3 +- .../elasticsearch/index/engine/Engine.java | 11 +++--- .../index/engine/EngineSearcher.java | 3 +- .../index/engine/FlushingRecoveryCounter.java | 2 +- .../index/engine/InternalEngine.java | 2 +- .../index/engine/RecoveryCounter.java | 4 +- .../index/engine/ShadowEngine.java | 2 +- .../fielddata/IndexFieldDataService.java | 1 - .../fielddata/IndexNumericFieldData.java | 1 - .../plain/AbstractIndexGeoPointFieldData.java | 1 - .../plain/BinaryDVAtomicFieldData.java | 1 - .../plain/BinaryDVNumericIndexFieldData.java | 2 - .../plain/BytesBinaryDVIndexFieldData.java | 2 - .../plain/DisabledIndexFieldData.java | 1 - .../plain/DocValuesIndexFieldData.java | 1 - .../plain/GeoPointBinaryDVIndexFieldData.java | 2 - .../plain/NumericDVIndexFieldData.java | 1 - .../plain/ParentChildIndexFieldData.java | 3 +- .../plain/SortedNumericDVIndexFieldData.java | 1 - .../SortedSetDVBytesAtomicFieldData.java | 1 - .../index/get/ShardGetService.java | 5 +-- .../index/mapper/DocumentMapper.java | 1 - .../index/mapper/MapperService.java | 1 - .../index/mapper/ParseContext.java | 2 - .../index/mapper/core/BooleanFieldMapper.java | 1 - .../index/mapper/core/ByteFieldMapper.java | 1 - .../mapper/core/CompletionFieldMapper.java | 2 - .../index/mapper/core/DateFieldMapper.java | 1 - .../index/mapper/core/DoubleFieldMapper.java | 1 - .../index/mapper/core/FloatFieldMapper.java | 1 - .../index/mapper/core/IntegerFieldMapper.java | 1 - .../index/mapper/core/LongFieldMapper.java | 1 - .../index/mapper/core/NumberFieldMapper.java | 1 - .../index/mapper/core/ShortFieldMapper.java | 1 - .../index/mapper/core/StringFieldMapper.java | 1 - .../index/mapper/geo/GeoPointFieldMapper.java | 2 - .../index/mapper/geo/GeoShapeFieldMapper.java | 1 - .../internal/FieldNamesFieldMapper.java | 1 - .../index/mapper/ip/IpFieldMapper.java | 5 +-- .../index/mapper/object/DynamicTemplate.java | 1 - .../policy/AbstractMergePolicyProvider.java | 1 - .../LogByteSizeMergePolicyProvider.java | 2 +- .../policy/LogDocMergePolicyProvider.java | 2 +- .../policy/TieredMergePolicyProvider.java | 2 +- .../index/query/BaseFilterBuilder.java | 4 +- .../index/query/BaseQueryBuilder.java | 4 +- .../index/query/BoostingQueryBuilder.java | 1 - .../index/query/CommonTermsQueryBuilder.java | 1 - .../index/query/CommonTermsQueryParser.java | 1 - .../index/query/FilterBuilder.java | 4 +- .../query/GeoBoundingBoxFilterBuilder.java | 1 - .../index/query/GeoShapeQueryParser.java | 1 - .../index/query/GeohashCellFilter.java | 1 - .../index/query/IndexQueryParserService.java | 10 ++--- .../index/query/MoreLikeThisQueryBuilder.java | 1 - .../index/query/MoreLikeThisQueryParser.java | 3 +- .../index/query/QueryBuilder.java | 4 +- .../elasticsearch/index/query/RegexpFlag.java | 1 - .../index/query/ScriptFilterParser.java | 3 +- .../index/query/SimpleQueryStringFlag.java | 3 +- .../index/query/SpanNearQueryBuilder.java | 1 - .../index/query/SpanNotQueryBuilder.java | 1 - .../index/query/SpanOrQueryBuilder.java | 1 - .../index/query/TemplateQueryBuilder.java | 1 - .../functionscore/DecayFunctionBuilder.java | 3 +- .../functionscore/DecayFunctionParser.java | 1 - .../FunctionScoreQueryBuilder.java | 3 +- .../functionscore/factor/FactorBuilder.java | 3 +- .../support/InnerHitsQueryParserHelper.java | 1 - .../index/query/support/QueryParsers.java | 1 - .../index/search/MatchQuery.java | 4 +- .../index/search/MultiMatchQuery.java | 3 +- .../index/search/child/ChildrenQuery.java | 8 ++-- .../child/CustomQueryWrappingFilter.java | 2 +- .../index/search/child/ParentQuery.java | 2 +- .../index/search/child/ScoreType.java | 1 - .../index/search/child/TopChildrenQuery.java | 3 +- .../index/search/geo/GeoDistanceFilter.java | 1 - .../search/geo/GeoDistanceRangeFilter.java | 1 - .../geo/IndexedGeoBoundingBoxFilter.java | 1 - .../index/search/shape/ShapeFetchService.java | 2 - .../elasticsearch/index/shard/IndexShard.java | 38 +++++++++---------- .../index/shard/IndexShardState.java | 3 +- .../index/shard/ShadowIndexShard.java | 1 - .../elasticsearch/index/shard/ShardPath.java | 1 - .../shard/TranslogRecoveryPerformer.java | 3 +- .../AbstractSimilarityProvider.java | 1 - .../similarity/DFRSimilarityProvider.java | 1 - .../similarity/IBSimilarityProvider.java | 1 - .../index/similarity/SimilarityModule.java | 1 - .../elasticsearch/index/store/IndexStore.java | 2 +- .../org/elasticsearch/index/store/Store.java | 1 - .../index/translog/Translog.java | 2 - .../index/translog/fs/FsChannelSnapshot.java | 2 +- .../index/translog/fs/FsTranslog.java | 2 +- .../index/translog/fs/FsTranslogFile.java | 3 +- .../elasticsearch/indices/IndicesService.java | 16 ++++---- .../breaker/CircuitBreakerService.java | 6 +-- .../HierarchyCircuitBreakerService.java | 1 - .../cache/filter/IndicesFilterCache.java | 3 +- .../cache/query/IndicesQueryCache.java | 1 - .../cluster/IndicesClusterStateService.java | 11 +++--- .../cache/IndicesFieldDataCache.java | 1 - .../memory/IndexingMemoryController.java | 6 +-- .../recovery/RecoverySourceHandler.java | 6 +-- .../indices/recovery/RecoveryState.java | 6 +-- .../SharedFSRecoverySourceHandler.java | 5 +-- .../TransportNodesListShardStoreMetaData.java | 2 +- .../indices/ttl/IndicesTTLService.java | 6 +-- .../elasticsearch/monitor/MonitorService.java | 6 +-- .../elasticsearch/monitor/jvm/HotThreads.java | 1 - .../monitor/jvm/JvmMonitorService.java | 6 +-- .../java/org/elasticsearch/node/Node.java | 5 +-- .../MultiDocumentPercolatorIndex.java | 2 +- .../percolator/PercolatorService.java | 3 +- .../SingleDocumentPercolatorIndex.java | 2 +- .../elasticsearch/plugins/PluginsService.java | 1 - .../repositories/RepositoriesService.java | 1 - .../blobstore/BlobStoreRepository.java | 6 +-- .../elasticsearch/rest/RestController.java | 8 ++-- .../org/elasticsearch/rest/RestFilter.java | 2 +- .../org/elasticsearch/rest/RestRequest.java | 1 - .../alias/RestIndicesAliasesAction.java | 1 - .../alias/put/RestIndexPutAliasAction.java | 1 - .../indices/analyze/RestAnalyzeAction.java | 3 +- .../indices/get/RestGetIndicesAction.java | 3 +- .../rest/action/count/RestCountAction.java | 1 - .../action/explain/RestExplainAction.java | 1 - .../rest/action/index/RestIndexAction.java | 1 - .../script/RestPutIndexedScriptAction.java | 1 - .../action/search/RestClearScrollAction.java | 3 +- .../rest/action/search/RestSearchAction.java | 1 - .../action/search/RestSearchScrollAction.java | 3 +- .../action/suggest/RestSuggestAction.java | 1 - .../rest/action/support/RestActions.java | 1 - .../elasticsearch/river/RiversManager.java | 6 +-- .../elasticsearch/river/RiversService.java | 10 ++--- .../river/cluster/RiverClusterService.java | 6 +-- .../river/routing/RiversRouter.java | 6 +-- .../script/NativeScriptEngineService.java | 3 +- .../java/org/elasticsearch/script/Script.java | 1 - .../elasticsearch/script/ScriptContext.java | 1 - .../script/ScriptContextRegistry.java | 1 - .../org/elasticsearch/script/ScriptMode.java | 1 - .../org/elasticsearch/script/ScriptModes.java | 1 - .../elasticsearch/script/ScriptModule.java | 1 - .../elasticsearch/script/ScriptService.java | 2 - .../script/expression/ExpressionScript.java | 1 - .../elasticsearch/search/MultiValueMode.java | 1 - .../org/elasticsearch/search/SearchPhase.java | 2 +- .../elasticsearch/search/SearchService.java | 31 ++++++++------- .../search/aggregations/AggregationPhase.java | 2 +- .../aggregations/AggregatorFactories.java | 1 - .../aggregations/InternalAggregations.java | 1 - .../InternalMultiBucketAggregation.java | 1 - .../bucket/BestBucketsDeferringCollector.java | 1 - .../bucket/BestDocsDeferringCollector.java | 1 - .../bucket/DeferringBucketCollector.java | 5 +-- .../InternalSingleBucketAggregation.java | 1 - .../children/ParentToChildrenAggregator.java | 1 - .../bucket/geogrid/GeoHashGridBuilder.java | 1 - .../bucket/global/GlobalAggregator.java | 1 - .../bucket/histogram/InternalHistogram.java | 1 - ...DiversifiedBytesHashSamplerAggregator.java | 1 - .../DiversifiedMapSamplerAggregator.java | 1 - .../DiversifiedNumericSamplerAggregator.java | 1 - .../DiversifiedOrdinalsSamplerAggregator.java | 1 - .../bucket/sampler/SamplerAggregator.java | 1 - .../SignificantTermsAggregatorFactory.java | 3 +- .../significant/SignificantTermsBuilder.java | 1 - .../heuristics/NXYSignificanceHeuristic.java | 1 - .../heuristics/SignificanceHeuristic.java | 1 - .../bucket/terms/InternalTerms.java | 1 - .../bucket/terms/TermsAggregatorFactory.java | 1 - .../bucket/terms/TermsBuilder.java | 1 - .../bucket/terms/support/IncludeExclude.java | 1 - .../InternalNumericMetricsAggregation.java | 1 - .../cardinality/CardinalityAggregator.java | 6 +-- .../cardinality/HyperLogLogPlusPlus.java | 2 +- .../metrics/geobounds/InternalGeoBounds.java | 1 - .../AbstractInternalPercentiles.java | 1 - .../scripted/InternalScriptedMetric.java | 1 - .../metrics/stats/StatsAggegator.java | 1 - .../extended/ExtendedStatsAggregator.java | 1 - .../metrics/tophits/InternalTopHits.java | 1 - .../aggregations/support/AggregationPath.java | 1 - .../support/format/ValueFormatterStreams.java | 1 - .../search/builder/SearchSourceBuilder.java | 1 - .../search/fetch/FetchPhase.java | 2 - .../search/fetch/FetchSubPhase.java | 4 +- .../fetch/explain/ExplainFetchSubPhase.java | 4 +- .../FieldDataFieldsFetchSubPhase.java | 4 +- .../FieldDataFieldsParseElement.java | 1 - .../innerhits/InnerHitsFetchSubPhase.java | 4 +- .../innerhits/InnerHitsParseElement.java | 1 - .../MatchedQueriesFetchSubPhase.java | 4 +- .../script/ScriptFieldsFetchSubPhase.java | 5 +-- .../fetch/source/FetchSourceSubPhase.java | 4 +- .../fetch/version/VersionFetchSubPhase.java | 4 +- .../highlight/FastVectorHighlighter.java | 1 - .../search/highlight/HighlightPhase.java | 5 +-- .../highlight/HighlighterParseElement.java | 1 - .../search/highlight/PlainHighlighter.java | 1 - .../search/highlight/PostingsHighlighter.java | 1 - .../search/internal/DefaultSearchContext.java | 2 +- .../search/lookup/LeafDocLookup.java | 1 - .../search/lookup/LeafFieldsLookup.java | 1 - .../query/TerminateAfterParseElement.java | 1 - .../search/rescore/QueryRescorer.java | 2 - .../search/rescore/RescoreParseElement.java | 1 - .../search/rescore/RescorePhase.java | 2 +- .../search/sort/FieldSortBuilder.java | 1 - .../search/sort/GeoDistanceSortParser.java | 1 - .../search/sort/SortParseElement.java | 1 - .../elasticsearch/search/suggest/Suggest.java | 1 - .../search/suggest/SuggestBuilder.java | 1 - .../search/suggest/SuggestParseElement.java | 1 - .../search/suggest/SuggestPhase.java | 2 +- .../search/suggest/SuggestUtils.java | 1 - .../suggest/SuggestionSearchContext.java | 1 - .../Completion090PostingsFormat.java | 1 - .../completion/CompletionSuggestParser.java | 1 - .../phrase/DirectCandidateGenerator.java | 1 - .../suggest/phrase/PhraseSuggestParser.java | 1 - .../phrase/PhraseSuggestionBuilder.java | 1 - .../phrase/PhraseSuggestionContext.java | 3 +- .../search/suggest/phrase/WordScorer.java | 1 - .../suggest/term/TermSuggestParser.java | 1 - .../snapshots/SnapshotState.java | 1 - .../snapshots/SnapshotsService.java | 8 ++-- .../elasticsearch/threadpool/ThreadPool.java | 1 - .../transport/PlainTransportFuture.java | 5 +-- .../transport/RequestHandlerRegistry.java | 1 - .../transport/TransportFuture.java | 4 +- .../transport/TransportRequestOptions.java | 1 - .../transport/TransportService.java | 9 ++--- .../transport/local/LocalTransport.java | 6 +-- .../netty/MessageChannelHandler.java | 1 - .../transport/netty/NettyTransport.java | 6 +-- .../org/elasticsearch/tribe/TribeService.java | 6 +-- .../watcher/ResourceWatcherService.java | 7 ++-- .../indices/create/CreateIndexTests.java | 1 - .../action/index/IndexRequestTests.java | 1 - .../ShardReplicationOperationTests.java | 2 +- .../GetTermVectorsCheckDocFreqTests.java | 2 +- .../termvectors/GetTermVectorsTests.java | 20 +++++----- .../aliases/IndexAliasesTests.java | 1 - .../BasicBackwardsCompatibilityTest.java | 1 - .../transport/FailAndRetryMockTransport.java | 6 +-- .../cluster/ClusterServiceTests.java | 6 +-- .../UpdateSettingsValidationTests.java | 1 - .../cluster/metadata/MetaDataTests.java | 1 - .../allocation/AllocationCommandsTests.java | 1 - .../decider/DiskThresholdDeciderTests.java | 1 - .../elasticsearch/common/BooleansTests.java | 1 - .../elasticsearch/common/ParseFieldTests.java | 1 - .../elasticsearch/common/PidFileTests.java | 1 - .../org/elasticsearch/common/TableTests.java | 1 - .../collect/CopyOnWriteHashMapTests.java | 1 - .../collect/CopyOnWriteHashSetTests.java | 1 - .../common/geo/GeoJSONShapeParserTests.java | 1 - .../recycler/AbstractRecyclerTests.java | 1 - .../common/unit/SizeValueTests.java | 1 - .../count/query/CountQueryTests.java | 2 +- .../discovery/zen/ZenDiscoveryUnitTest.java | 1 - .../env/NodeEnvironmentTests.java | 1 - .../FieldStatsIntegrationTests.java | 1 - .../gateway/MetaDataStateFormatTest.java | 1 - .../netty/NettyHttpServerPipeliningTest.java | 2 +- .../analysis/KeepFilterFactoryTests.java | 1 - .../analysis/NGramTokenizerFactoryTests.java | 1 - .../PatternCaptureTokenFilterTests.java | 1 - .../CommonGramsTokenFilterFactoryTests.java | 1 - .../engine/InternalEngineSettingsTest.java | 1 - ...TokenCountFieldMapperIntegrationTests.java | 8 ++-- .../mapper/date/SimpleDateMappingTests.java | 3 +- .../index/mapper/ip/SimpleIpMappingTests.java | 1 - .../merge/policy/MergePolicySettingsTest.java | 1 - .../query/SimpleIndexQueryParserTests.java | 3 +- .../index/search/child/ScoreTypeTests.java | 1 - .../index/shard/IndexShardTests.java | 2 - .../index/shard/ShardPathTests.java | 1 - .../IndicesOptionsIntegrationTests.java | 1 - .../indices/IndicesServiceTest.java | 1 - .../indices/analyze/AnalyzeActionTests.java | 3 +- .../indices/recovery/RecoveryStateTest.java | 1 - .../settings/UpdateNumberOfReplicasTests.java | 1 - .../indices/settings/UpdateSettingsTests.java | 1 - .../state/CloseIndexDisableCloseAllTests.java | 1 - .../template/SimpleIndexTemplateTests.java | 1 - .../plugins/PluginManagerTests.java | 1 - .../HeadersAndContextCopyClientTests.java | 2 +- .../routing/AliasResolveRoutingTests.java | 1 - .../script/CustomScriptContextTests.java | 1 - .../script/ScriptContextRegistryTests.java | 1 - .../script/ScriptModesTests.java | 1 - .../script/ScriptServiceTests.java | 1 - .../SignificanceHeuristicTests.java | 1 - .../child/SimpleChildQuerySearchTests.java | 11 +++--- .../DecayFunctionScoreTests.java | 2 - .../highlight/HighlighterSearchTests.java | 20 +++++----- .../preference/SearchPreferenceTests.java | 1 - .../search/query/SearchQueryTests.java | 10 ++--- .../search/scroll/SearchScrollTests.java | 1 - .../search/simple/SimpleSearchTests.java | 1 - .../search/sort/SimpleSortTests.java | 8 ++-- .../suggest/ContextSuggestSearchTests.java | 1 - .../search/suggest/SuggestSearchTests.java | 11 +++--- .../SharedClusterSnapshotRestoreTests.java | 1 - .../snapshots/mockstore/MockRepository.java | 2 +- .../test/InternalTestCluster.java | 1 - .../org/elasticsearch/test/TestCluster.java | 1 - .../elasticsearch/test/TestSearchContext.java | 2 +- .../cache/recycler/MockPageCacheRecycler.java | 2 +- .../test/cluster/NoopClusterService.java | 9 ++--- .../test/cluster/TestClusterService.java | 7 ++-- .../index/merge/NoMergePolicyProvider.java | 2 +- .../test/transport/CapturingTransport.java | 6 +-- .../test/transport/MockTransportService.java | 6 +-- .../transport/netty/KeyedLockTests.java | 1 - .../elasticsearch/update/UpdateNoopTests.java | 2 +- 576 files changed, 483 insertions(+), 930 deletions(-) diff --git a/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java b/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java index 6e7c718769c54..0b7c433da7f59 100644 --- a/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java +++ b/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import java.lang.IllegalArgumentException; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/org/apache/lucene/store/StoreRateLimiting.java b/src/main/java/org/apache/lucene/store/StoreRateLimiting.java index b474817183b4f..e50c92065e2a4 100644 --- a/src/main/java/org/apache/lucene/store/StoreRateLimiting.java +++ b/src/main/java/org/apache/lucene/store/StoreRateLimiting.java @@ -19,7 +19,6 @@ package org.apache.lucene.store; import org.apache.lucene.store.RateLimiter.SimpleRateLimiter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.ByteSizeValue; @@ -42,7 +41,7 @@ public static enum Type { MERGE, ALL; - public static Type fromString(String type) throws IllegalArgumentException { + public static Type fromString(String type) { if ("none".equalsIgnoreCase(type)) { return NONE; } else if ("merge".equalsIgnoreCase(type)) { @@ -88,7 +87,7 @@ public void setType(Type type) { this.type = type; } - public void setType(String type) throws IllegalArgumentException { + public void setType(String type) { this.type = Type.fromString(type); } } diff --git a/src/main/java/org/elasticsearch/action/ActionFuture.java b/src/main/java/org/elasticsearch/action/ActionFuture.java index 60115143e9dc2..f2b1d87ee5e5c 100644 --- a/src/main/java/org/elasticsearch/action/ActionFuture.java +++ b/src/main/java/org/elasticsearch/action/ActionFuture.java @@ -42,7 +42,7 @@ public interface ActionFuture extends Future { * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is * still accessible using {@link #getRootFailure()}. */ - T actionGet() throws ElasticsearchException; + T actionGet(); /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing @@ -53,7 +53,7 @@ public interface ActionFuture extends Future { * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is * still accessible using {@link #getRootFailure()}. */ - T actionGet(String timeout) throws ElasticsearchException; + T actionGet(String timeout); /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing @@ -66,7 +66,7 @@ public interface ActionFuture extends Future { * * @param timeoutMillis Timeout in millis */ - T actionGet(long timeoutMillis) throws ElasticsearchException; + T actionGet(long timeoutMillis); /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing @@ -77,7 +77,7 @@ public interface ActionFuture extends Future { * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is * still accessible using {@link #getRootFailure()}. */ - T actionGet(long timeout, TimeUnit unit) throws ElasticsearchException; + T actionGet(long timeout, TimeUnit unit); /** * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing @@ -88,7 +88,7 @@ public interface ActionFuture extends Future { * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is * still accessible using {@link #getRootFailure()}. */ - T actionGet(TimeValue timeout) throws ElasticsearchException; + T actionGet(TimeValue timeout); /** * The root (possibly) wrapped failure. diff --git a/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java index d52b2cf59238c..4335a40e03011 100644 --- a/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java @@ -69,21 +69,21 @@ public ListenableActionFuture execute() { /** * Short version of execute().actionGet(). */ - public Response get() throws ElasticsearchException { + public Response get() { return execute().actionGet(); } /** * Short version of execute().actionGet(). */ - public Response get(TimeValue timeout) throws ElasticsearchException { + public Response get(TimeValue timeout) { return execute().actionGet(timeout); } /** * Short version of execute().actionGet(). */ - public Response get(String timeout) throws ElasticsearchException { + public Response get(String timeout) { return execute().actionGet(timeout); } diff --git a/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java index b4fd7c300595d..d41900c27af78 100644 --- a/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java +++ b/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java @@ -21,7 +21,6 @@ import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/elasticsearch/action/ThreadingModel.java b/src/main/java/org/elasticsearch/action/ThreadingModel.java index f812a5c7777e0..a4e020d9f0822 100644 --- a/src/main/java/org/elasticsearch/action/ThreadingModel.java +++ b/src/main/java/org/elasticsearch/action/ThreadingModel.java @@ -19,7 +19,6 @@ package org.elasticsearch.action; -import java.lang.IllegalArgumentException; /** * diff --git a/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java b/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java index 1ce18498eabf7..0813e85960f59 100644 --- a/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java +++ b/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java @@ -19,7 +19,6 @@ package org.elasticsearch.action; -import java.lang.IllegalArgumentException; /** * Write Consistency Level control how many replicas should be active for a write operation to occur (a write operation diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java index 9a41708693fa3..7936bc1d8fdbd 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.health; -import java.lang.IllegalArgumentException; /** * diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index fdcdcb0a97ae4..0564c8d289781 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.cluster.health; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; @@ -66,7 +65,7 @@ protected ClusterHealthResponse newResponse() { } @Override - protected void masterOperation(final ClusterHealthRequest request, final ClusterState unusedState, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final ClusterHealthRequest request, final ClusterState unusedState, final ActionListener listener) { if (request.waitForEvents() != null) { final long endTime = System.currentTimeMillis() + request.timeout().millis(); clusterService.submitStateUpdateTask("cluster_health (wait_for_events [" + request.waitForEvents() + "])", request.waitForEvents(), new ProcessedClusterStateUpdateTask() { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java index 15534ff71a99e..8b509ef2d941e 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java @@ -73,7 +73,7 @@ protected NodeHotThreads newNodeResponse() { } @Override - protected NodeHotThreads nodeOperation(NodeRequest request) throws ElasticsearchException { + protected NodeHotThreads nodeOperation(NodeRequest request) { HotThreads hotThreads = new HotThreads() .busiestThreads(request.request.threads) .type(request.request.type) diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java index ab3e4f05d3448..e091854ea59a0 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java @@ -77,7 +77,7 @@ protected NodeInfo newNodeResponse() { } @Override - protected NodeInfo nodeOperation(NodeInfoRequest nodeRequest) throws ElasticsearchException { + protected NodeInfo nodeOperation(NodeInfoRequest nodeRequest) { NodesInfoRequest request = nodeRequest.request; return nodeService.info(request.settings(), request.os(), request.process(), request.jvm(), request.threadPool(), request.network(), request.transport(), request.http(), request.plugins()); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java index ee9814eab6bdf..31adc2d6e6790 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java @@ -77,7 +77,7 @@ protected NodeStats newNodeResponse() { } @Override - protected NodeStats nodeOperation(NodeStatsRequest nodeStatsRequest) throws ElasticsearchException { + protected NodeStats nodeOperation(NodeStatsRequest nodeStatsRequest) { NodesStatsRequest request = nodeStatsRequest.request; return nodeService.stats(request.indices(), request.os(), request.process(), request.jvm(), request.threadPool(), request.network(), request.fs(), request.transport(), request.http(), request.breaker()); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java index 78a6d0462d50b..5ec0d68eb0c28 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java @@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(DeleteRepositoryRequest request, Clus } @Override - protected void masterOperation(final DeleteRepositoryRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final DeleteRepositoryRequest request, ClusterState state, final ActionListener listener) { repositoriesService.unregisterRepository( new RepositoriesService.UnregisterRepositoryRequest("delete_repository [" + request.name() + "]", request.name()) .masterNodeTimeout(request.masterNodeTimeout()).ackTimeout(request.timeout()), diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java index 026a5c404a76d..fda863eb271e8 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java @@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(GetRepositoriesRequest request, Clust } @Override - protected void masterOperation(final GetRepositoriesRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final GetRepositoriesRequest request, ClusterState state, final ActionListener listener) { MetaData metaData = state.metaData(); RepositoriesMetaData repositories = metaData.custom(RepositoriesMetaData.TYPE); if (request.repositories().length == 0 || (request.repositories().length == 1 && "_all".equals(request.repositories()[0]))) { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java index cc7538ce1c572..e0fdc30b3ada9 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.cluster.repositories.put; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.AcknowledgedRequest; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java index 53d940a23e841..c9eb8a8c5f5fe 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java @@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(PutRepositoryRequest request, Cluster } @Override - protected void masterOperation(final PutRepositoryRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final PutRepositoryRequest request, ClusterState state, final ActionListener listener) { repositoriesService.registerRepository( new RepositoriesService.RegisterRepositoryRequest("put_repository [" + request.name() + "]", diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java index 7f47a4888b6ac..6ce60afc74c09 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java @@ -68,7 +68,7 @@ protected ClusterBlockException checkBlock(VerifyRepositoryRequest request, Clus } @Override - protected void masterOperation(final VerifyRepositoryRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final VerifyRepositoryRequest request, ClusterState state, final ActionListener listener) { repositoriesService.verifyRepository(request.name(), new ActionListener() { @Override public void onResponse(RepositoriesService.VerifyResponse verifyResponse) { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java index e0617f4d0416b..05c46177d867a 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java @@ -67,7 +67,7 @@ protected ClusterRerouteResponse newResponse() { } @Override - protected void masterOperation(final ClusterRerouteRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final ClusterRerouteRequest request, final ClusterState state, final ActionListener listener) { clusterService.submitStateUpdateTask("cluster_reroute (api)", Priority.IMMEDIATE, new AckedClusterStateUpdateTask(request, listener) { private volatile ClusterState clusterStateToSend; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java index efef83a6e49e0..526b6afa38914 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java @@ -86,7 +86,7 @@ protected ClusterUpdateSettingsResponse newResponse() { } @Override - protected void masterOperation(final ClusterUpdateSettingsRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final ClusterUpdateSettingsRequest request, final ClusterState state, final ActionListener listener) { final ImmutableSettings.Builder transientUpdates = ImmutableSettings.settingsBuilder(); final ImmutableSettings.Builder persistentUpdates = ImmutableSettings.settingsBuilder(); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java index faf6101109c50..de8e1fcdfab01 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.shards; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java index 921effbc15f7d..bc83fecf647af 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java @@ -67,7 +67,7 @@ protected ClusterSearchShardsResponse newResponse() { } @Override - protected void masterOperation(final ClusterSearchShardsRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final ClusterSearchShardsRequest request, final ClusterState state, final ActionListener listener) { ClusterState clusterState = clusterService.state(); String[] concreteIndices = clusterState.metaData().concreteIndices(request.indicesOptions(), request.indices()); Map> routingMap = clusterState.metaData().resolveSearchRouting(request.routing(), request.indices()); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index ed8130ec66183..4cafbb2e52d3d 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.create; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java index dc72f2dcce4e0..0441ec41dd287 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java @@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(CreateSnapshotRequest request, Cluste } @Override - protected void masterOperation(final CreateSnapshotRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final CreateSnapshotRequest request, ClusterState state, final ActionListener listener) { SnapshotsService.SnapshotRequest snapshotRequest = new SnapshotsService.SnapshotRequest("create_snapshot[" + request.snapshot() + "]", request.snapshot(), request.repository()) .indices(request.indices()) diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java index 3ee7fa558140d..2b59a09db2bd5 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java @@ -63,7 +63,7 @@ protected ClusterBlockException checkBlock(DeleteSnapshotRequest request, Cluste } @Override - protected void masterOperation(final DeleteSnapshotRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final DeleteSnapshotRequest request, ClusterState state, final ActionListener listener) { SnapshotId snapshotIds = new SnapshotId(request.repository(), request.snapshot()); snapshotsService.deleteSnapshot(snapshotIds, new SnapshotsService.DeleteSnapshotListener() { @Override diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java index c67a4eda73cac..dd36800a27763 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java @@ -66,7 +66,7 @@ protected ClusterBlockException checkBlock(GetSnapshotsRequest request, ClusterS } @Override - protected void masterOperation(final GetSnapshotsRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final GetSnapshotsRequest request, ClusterState state, final ActionListener listener) { try { ImmutableList.Builder snapshotInfoBuilder = ImmutableList.builder(); if (isAllSnapshots(request.snapshots())) { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java index 914331b33ef37..4be7b39da9a40 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.restore; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java index e7ecfbcb1a87f..a1ea5f3f2df9b 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java @@ -70,7 +70,7 @@ protected ClusterBlockException checkBlock(RestoreSnapshotRequest request, Clust } @Override - protected void masterOperation(final RestoreSnapshotRequest request, ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final RestoreSnapshotRequest request, ClusterState state, final ActionListener listener) { RestoreService.RestoreRequest restoreRequest = new RestoreService.RestoreRequest( "restore_snapshot[" + request.snapshot() + "]", request.repository(), request.snapshot(), request.indices(), request.indicesOptions(), request.renamePattern(), request.renameReplacement(), diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java index 8b3694531d342..efbc82c9b6a83 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import java.lang.IllegalArgumentException; /** */ diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java index 44bb9a4163865..878ca704345b4 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java index 6fdbaa5edd927..ba3bd7a8c776a 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilderString; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java index 82be56b089b14..b23010e3ecc34 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java @@ -94,7 +94,7 @@ protected NodesSnapshotStatus newResponse(Request request, AtomicReferenceArray } @Override - protected NodeSnapshotStatus nodeOperation(NodeRequest request) throws ElasticsearchException { + protected NodeSnapshotStatus nodeOperation(NodeRequest request) { ImmutableMap.Builder> snapshotMapBuilder = ImmutableMap.builder(); try { String nodeId = clusterService.localNode().id(); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java index d3bcbcf53049e..edfc9d5fd3277 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java index fc1db98c35e18..7b114c92d4399 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java @@ -79,7 +79,7 @@ protected ClusterStateResponse newResponse() { } @Override - protected void masterOperation(final ClusterStateRequest request, final ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final ClusterStateRequest request, final ClusterState state, ActionListener listener) { ClusterState currentState = clusterService.state(); logger.trace("Serving cluster state request using version {}", currentState.version()); ClusterState.Builder builder = ClusterState.builder(currentState.getClusterName()); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java index fd689945a5854..7f7d00ad52986 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java @@ -97,7 +97,7 @@ protected ClusterStatsNodeResponse newNodeResponse() { } @Override - protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeRequest) throws ElasticsearchException { + protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeRequest) { NodeInfo nodeInfo = nodeService.info(false, true, false, true, false, false, true, false, true); NodeStats nodeStats = nodeService.stats(CommonStatsFlags.NONE, false, true, true, false, false, true, false, false, false); List shardsStats = new ArrayList<>(); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java index 021be9f80fd35..938f176e35cb1 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java @@ -62,7 +62,7 @@ protected PendingClusterTasksResponse newResponse() { } @Override - protected void masterOperation(PendingClusterTasksRequest request, ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(PendingClusterTasksRequest request, ClusterState state, ActionListener listener) { listener.onResponse(new PendingClusterTasksResponse(clusterService.pendingTasks())); } } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java index b782868b577e1..15cd244ba2360 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.indices.alias; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java index 0149d32d2fe42..e2bf884428a90 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java @@ -77,7 +77,7 @@ protected ClusterBlockException checkBlock(IndicesAliasesRequest request, Cluste } @Override - protected void masterOperation(final IndicesAliasesRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final IndicesAliasesRequest request, final ClusterState state, final ActionListener listener) { //Expand the indices names List actions = request.aliasActions(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java index 3df818aa8b6c3..675d0d88922bb 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java @@ -58,7 +58,7 @@ protected AliasesExistResponse newResponse() { } @Override - protected void masterOperation(GetAliasesRequest request, ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(GetAliasesRequest request, ClusterState state, ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); boolean result = state.metaData().hasAliases(request.aliases(), concreteIndices); listener.onResponse(new AliasesExistResponse(result)); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java index fd5c722b01277..095aee369aa4e 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java @@ -61,7 +61,7 @@ protected GetAliasesResponse newResponse() { } @Override - protected void masterOperation(GetAliasesRequest request, ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(GetAliasesRequest request, ClusterState state, ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); @SuppressWarnings("unchecked") // ImmutableList to List results incompatible type ImmutableOpenMap> result = (ImmutableOpenMap) state.metaData().findAliases(request.aliases(), concreteIndices); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java index 0b9c6e6b186ee..f1c9afe84a43e 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java @@ -26,7 +26,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.single.custom.TransportSingleCustomOperationAction; @@ -97,7 +96,7 @@ protected ShardsIterator shards(ClusterState state, InternalRequest request) { } @Override - protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId) throws ElasticsearchException { + protected AnalyzeResponse shardOperation(AnalyzeRequest request, ShardId shardId) { IndexService indexService = null; if (shardId != null) { indexService = indicesService.indexServiceSafe(shardId.getIndex()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java index ca03241bf257b..f5f27115869c8 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java @@ -97,7 +97,7 @@ protected ShardClearIndicesCacheResponse newShardResponse() { } @Override - protected ShardClearIndicesCacheResponse shardOperation(ShardClearIndicesCacheRequest request) throws ElasticsearchException { + protected ShardClearIndicesCacheResponse shardOperation(ShardClearIndicesCacheRequest request) { IndexService service = indicesService.indexService(request.shardId().getIndex()); if (service != null) { IndexShard shard = service.shard(request.shardId().id()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java index c0afb720e89ab..8c360590a6474 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java @@ -75,7 +75,7 @@ protected ClusterBlockException checkBlock(CloseIndexRequest request, ClusterSta } @Override - protected void masterOperation(final CloseIndexRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final CloseIndexRequest request, final ClusterState state, final ActionListener listener) { final String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); CloseIndexClusterStateUpdateRequest updateRequest = new CloseIndexClusterStateUpdateRequest() .ackTimeout(request.timeout()).masterNodeTimeout(request.masterNodeTimeout()) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 38782547440d1..d79c21286115b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -22,7 +22,6 @@ import com.google.common.base.Charsets; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index 14e8e1c9a2419..18bca510a6ed8 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -66,7 +66,7 @@ protected ClusterBlockException checkBlock(CreateIndexRequest request, ClusterSt } @Override - protected void masterOperation(final CreateIndexRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final CreateIndexRequest request, final ClusterState state, final ActionListener listener) { String cause = request.cause(); if (cause.length() == 0) { cause = "api"; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java index 67ffc22c400db..4fa760c7a9e05 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java @@ -75,7 +75,7 @@ protected ClusterBlockException checkBlock(DeleteIndexRequest request, ClusterSt } @Override - protected void masterOperation(final DeleteIndexRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final DeleteIndexRequest request, final ClusterState state, final ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); if (concreteIndices.length == 0) { listener.onResponse(new DeleteIndexResponse(true)); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java index f388a39069092..45572ef801d97 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java @@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(IndicesExistsRequest request, Cluster } @Override - protected void masterOperation(final IndicesExistsRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final IndicesExistsRequest request, final ClusterState state, final ActionListener listener) { boolean exists; try { // Similar as the previous behaviour, but now also aliases and wildcards are supported. diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java index d5bd8a6bb3ad0..ced21bd98e012 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java @@ -61,7 +61,7 @@ protected ClusterBlockException checkBlock(TypesExistsRequest request, ClusterSt } @Override - protected void masterOperation(final TypesExistsRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final TypesExistsRequest request, final ClusterState state, final ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); if (concreteIndices.length == 0) { listener.onResponse(new TypesExistsResponse(false)); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java index c0b44d150ec99..1d91fd6d8009e 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java @@ -90,7 +90,7 @@ protected ShardFlushResponse newShardResponse() { } @Override - protected ShardFlushResponse shardOperation(ShardFlushRequest request) throws ElasticsearchException { + protected ShardFlushResponse shardOperation(ShardFlushRequest request) { IndexShard indexShard = indicesService.indexServiceSafe(request.shardId().getIndex()).shardSafe(request.shardId().id()); indexShard.flush(request.getRequest()); return new ShardFlushResponse(request.shardId()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java index 03ca578bedb96..ccede960e54d5 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java @@ -21,7 +21,6 @@ import com.google.common.collect.ObjectArrays; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.info.ClusterInfoRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -74,7 +73,7 @@ public boolean validName(String name) { return this.validNames.contains(name); } - public static Feature fromName(String name) throws IllegalArgumentException { + public static Feature fromName(String name) { for (Feature feature : Feature.values()) { if (feature.validName(name)) { return feature; @@ -83,7 +82,7 @@ public static Feature fromName(String name) throws IllegalArgumentException { throw new IllegalArgumentException("No feature for name [" + name + "]"); } - public static Feature fromId(byte id) throws IllegalArgumentException { + public static Feature fromId(byte id) { if (id < 0 || id >= FEATURES.length) { throw new IllegalArgumentException("No mapping for id [" + id + "]"); } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java index 4b47e95c2bc8b..db9bfe99133bb 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature; import org.elasticsearch.action.support.ActionFilters; @@ -70,7 +69,7 @@ protected GetIndexResponse newResponse() { @Override protected void doMasterOperation(final GetIndexRequest request, String[] concreteIndices, final ClusterState state, - final ActionListener listener) throws ElasticsearchException { + final ActionListener listener) { ImmutableOpenMap> warmersResult = ImmutableOpenMap.of(); ImmutableOpenMap> mappingsResult = ImmutableOpenMap.of(); ImmutableOpenMap> aliasesResult = ImmutableOpenMap.of(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java index 5886fe55d65a9..ab6b31c0bb6a1 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java @@ -87,7 +87,7 @@ protected ShardsIterator shards(ClusterState state, InternalRequest request) { } @Override - protected GetFieldMappingsResponse shardOperation(final GetFieldMappingsIndexRequest request, ShardId shardId) throws ElasticsearchException { + protected GetFieldMappingsResponse shardOperation(final GetFieldMappingsIndexRequest request, ShardId shardId) { assert shardId != null; IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex()); Collection typeIntersection; @@ -173,7 +173,7 @@ public Boolean paramAsBooleanOptional(String key, Boolean defaultValue) { } }; - private ImmutableMap findFieldMappingsByType(DocumentMapper documentMapper, GetFieldMappingsIndexRequest request) throws ElasticsearchException { + private ImmutableMap findFieldMappingsByType(DocumentMapper documentMapper, GetFieldMappingsIndexRequest request) { MapBuilder fieldMappings = new MapBuilder<>(); final DocumentFieldMappers allFieldMappers = documentMapper.mappers(); for (String field : request.fields()) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java index 8b9f67fcbb570..9867aeaf80ca2 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java @@ -60,7 +60,7 @@ protected GetMappingsResponse newResponse() { } @Override - protected void doMasterOperation(final GetMappingsRequest request, String[] concreteIndices, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void doMasterOperation(final GetMappingsRequest request, String[] concreteIndices, final ClusterState state, final ActionListener listener) { logger.trace("serving getMapping request based on version {}", state.version()); ImmutableOpenMap> result = state.metaData().findMappings( concreteIndices, request.types() diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java index b990a7e90b035..a2f28a9bcfcd9 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java @@ -21,7 +21,6 @@ import com.carrotsearch.hppc.ObjectOpenHashSet; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java index 700c90c02ce09..dffb1780423ce 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java @@ -65,7 +65,7 @@ protected ClusterBlockException checkBlock(PutMappingRequest request, ClusterSta } @Override - protected void masterOperation(final PutMappingRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final PutMappingRequest request, final ClusterState state, final ActionListener listener) { final String[] concreteIndices = clusterService.state().metaData().concreteIndices(request.indicesOptions(), request.indices()); PutMappingClusterStateUpdateRequest updateRequest = new PutMappingClusterStateUpdateRequest() .ackTimeout(request.timeout()).masterNodeTimeout(request.masterNodeTimeout()) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java index a704c4a3d59cd..7a74cc123e1aa 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java @@ -75,7 +75,7 @@ protected ClusterBlockException checkBlock(OpenIndexRequest request, ClusterStat } @Override - protected void masterOperation(final OpenIndexRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final OpenIndexRequest request, final ClusterState state, final ActionListener listener) { final String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); OpenIndexClusterStateUpdateRequest updateRequest = new OpenIndexClusterStateUpdateRequest() .ackTimeout(request.timeout()).masterNodeTimeout(request.masterNodeTimeout()) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java index 94a7b930e7914..3c99a909e1931 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java @@ -91,7 +91,7 @@ protected ShardOptimizeResponse newShardResponse() { } @Override - protected ShardOptimizeResponse shardOperation(ShardOptimizeRequest request) throws ElasticsearchException { + protected ShardOptimizeResponse shardOperation(ShardOptimizeRequest request) { IndexShard indexShard = indicesService.indexServiceSafe(request.shardId().getIndex()).shardSafe(request.shardId().id()); indexShard.optimize(request.optimizeRequest()); return new ShardOptimizeResponse(request.shardId()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java index 15498be5382d4..6287136e69f9a 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java @@ -124,7 +124,7 @@ protected ShardRecoveryResponse newShardResponse() { } @Override - protected ShardRecoveryResponse shardOperation(ShardRecoveryRequest request) throws ElasticsearchException { + protected ShardRecoveryResponse shardOperation(ShardRecoveryRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java index 73af682f4ff24..713a14bad472a 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java @@ -91,7 +91,7 @@ protected ShardRefreshResponse newShardResponse() { } @Override - protected ShardRefreshResponse shardOperation(ShardRefreshRequest request) throws ElasticsearchException { + protected ShardRefreshResponse shardOperation(ShardRefreshRequest request) { IndexShard indexShard = indicesService.indexServiceSafe(request.shardId().getIndex()).shardSafe(request.shardId().id()); indexShard.refresh("api"); logger.trace("{} refresh request executed", indexShard.shardId()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java index 60c70007408f4..fb416d41aae49 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java @@ -117,7 +117,7 @@ protected ShardSegments newShardResponse() { } @Override - protected ShardSegments shardOperation(IndexShardSegmentRequest request) throws ElasticsearchException { + protected ShardSegments shardOperation(IndexShardSegmentRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); return new ShardSegments(indexShard.routingEntry(), indexShard.engine().segments(request.verbose)); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java index 5d99f9f7592a4..7c4dfd49763f3 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java @@ -72,7 +72,7 @@ protected GetSettingsResponse newResponse() { } @Override - protected void masterOperation(GetSettingsRequest request, ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(GetSettingsRequest request, ClusterState state, ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); ImmutableOpenMap.Builder indexToSettingsBuilder = ImmutableOpenMap.builder(); for (String concreteIndex : concreteIndices) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java index 968c93f3fae36..08195d17e3885 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java @@ -74,7 +74,7 @@ protected UpdateSettingsResponse newResponse() { } @Override - protected void masterOperation(final UpdateSettingsRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final UpdateSettingsRequest request, final ClusterState state, final ActionListener listener) { final String[] concreteIndices = clusterService.state().metaData().concreteIndices(request.indicesOptions(), request.indices()); UpdateSettingsClusterStateUpdateRequest clusterStateUpdateRequest = new UpdateSettingsClusterStateUpdateRequest() .indices(concreteIndices) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java index eb2e92370ffcd..4561c80cfd44c 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java @@ -119,7 +119,7 @@ protected ShardStats newShardResponse() { } @Override - protected ShardStats shardOperation(IndexShardStatsRequest request) throws ElasticsearchException { + protected ShardStats shardOperation(IndexShardStatsRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); // if we don't have the routing entry yet, we need it stats wise, we treat it as if the shard is not ready yet diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java index 3e7772afd84d6..4e6fe81b7fd10 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java @@ -63,7 +63,7 @@ protected ClusterBlockException checkBlock(DeleteIndexTemplateRequest request, C } @Override - protected void masterOperation(final DeleteIndexTemplateRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final DeleteIndexTemplateRequest request, final ClusterState state, final ActionListener listener) { indexTemplateService.removeTemplates(new MetaDataIndexTemplateService.RemoveRequest(request.name()).masterTimeout(request.masterNodeTimeout()), new MetaDataIndexTemplateService.RemoveListener() { @Override public void onResponse(MetaDataIndexTemplateService.RemoveResponse response) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java index 1a7cc798731e1..5ff737c4d2868 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java @@ -63,7 +63,7 @@ protected GetIndexTemplatesResponse newResponse() { } @Override - protected void masterOperation(GetIndexTemplatesRequest request, ClusterState state, ActionListener listener) throws ElasticsearchException { + protected void masterOperation(GetIndexTemplatesRequest request, ClusterState state, ActionListener listener) { List results; // If we did not ask for a specific name, then we return all templates diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java index 9d8619219f8d7..41dd9ec2b4520 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.template.put; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java index ac345a732e24b..d0b771262c29c 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java @@ -63,7 +63,7 @@ protected ClusterBlockException checkBlock(PutIndexTemplateRequest request, Clus } @Override - protected void masterOperation(final PutIndexTemplateRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final PutIndexTemplateRequest request, final ClusterState state, final ActionListener listener) { String cause = request.cause(); if (cause.length() == 0) { cause = "api"; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java index 6a1ba30946fb2..99bb447bed832 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java @@ -156,7 +156,7 @@ protected ValidateQueryResponse newResponse(ValidateQueryRequest request, Atomic } @Override - protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request) throws ElasticsearchException { + protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexQueryParserService queryParserService = indexService.queryParserService(); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java index 6ba466eae1abe..17a30e50ce177 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java @@ -72,7 +72,7 @@ protected ClusterBlockException checkBlock(DeleteWarmerRequest request, ClusterS } @Override - protected void masterOperation(final DeleteWarmerRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final DeleteWarmerRequest request, final ClusterState state, final ActionListener listener) { final String[] concreteIndices = clusterService.state().metaData().concreteIndices(request.indicesOptions(), request.indices()); clusterService.submitStateUpdateTask("delete_warmer [" + Arrays.toString(request.names()) + "]", new AckedClusterStateUpdateTask(request, listener) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java index 2a84efbbfdf22..b9fe92ea438d0 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java @@ -64,7 +64,7 @@ protected GetWarmersResponse newResponse() { } @Override - protected void doMasterOperation(final GetWarmersRequest request, String[] concreteIndices, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void doMasterOperation(final GetWarmersRequest request, String[] concreteIndices, final ClusterState state, final ActionListener listener) { ImmutableOpenMap> result = state.metaData().findWarmers( concreteIndices, request.types(), request.warmers() ); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java index 08e5d78d687e7..e92eb3195d702 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java @@ -85,7 +85,7 @@ protected ClusterBlockException checkBlock(PutWarmerRequest request, ClusterStat } @Override - protected void masterOperation(final PutWarmerRequest request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected void masterOperation(final PutWarmerRequest request, final ClusterState state, final ActionListener listener) { // first execute the search request, see that its ok... SearchRequest searchRequest = new SearchRequest(request.searchRequest(), request); searchAction.execute(searchRequest, new ActionListener() { diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java b/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java index 607b7a69c6521..be26f318625b9 100644 --- a/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java +++ b/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.bulk; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.delete.DeleteRequest; diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java index b0f12b5996e52..617c3fc32bdc2 100644 --- a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java +++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.bulk; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.*; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java index 799c7c073b187..59c2614af1b2b 100644 --- a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java +++ b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.bulk; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionWriteResponse; diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java index 6ed17c8c11a0e..a37ba887fd5fb 100644 --- a/src/main/java/org/elasticsearch/action/count/CountRequest.java +++ b/src/main/java/org/elasticsearch/action/count/CountRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.count; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; diff --git a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java index 0c2496cda1a9b..ed39bbb01aca8 100644 --- a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java +++ b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java @@ -143,7 +143,7 @@ protected CountResponse newResponse(CountRequest request, AtomicReferenceArray s } @Override - protected ShardCountResponse shardOperation(ShardCountRequest request) throws ElasticsearchException { + protected ShardCountResponse shardOperation(ShardCountRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); diff --git a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java index 47c8890616547..5aa929913f2f2 100644 --- a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java +++ b/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.delete; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.RoutingMissingException; diff --git a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java index 8d782012931d3..a440d4a6eb1ca 100644 --- a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java +++ b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java @@ -144,7 +144,7 @@ protected ExistsResponse newResponse(ExistsRequest request, AtomicReferenceArray } @Override - protected ShardExistsResponse shardOperation(ShardExistsRequest request) throws ElasticsearchException { + protected ShardExistsResponse shardOperation(ShardExistsRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); diff --git a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java index be9c865a436e8..c2ca4c7558a62 100644 --- a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java +++ b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java @@ -100,7 +100,7 @@ protected void resolveRequest(ClusterState state, InternalRequest request) { } @Override - protected ExplainResponse shardOperation(ExplainRequest request, ShardId shardId) throws ElasticsearchException { + protected ExplainResponse shardOperation(ExplainRequest request, ShardId shardId) { IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex()); IndexShard indexShard = indexService.shardSafe(shardId.id()); Term uidTerm = new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(request.type(), request.id())); @@ -149,7 +149,7 @@ protected ExplainResponse newResponse() { } @Override - protected ShardIterator shards(ClusterState state, InternalRequest request) throws ElasticsearchException { + protected ShardIterator shards(ClusterState state, InternalRequest request) { return clusterService.operationRouting().getShards( clusterService.state(), request.concreteIndex(), request.request().type(), request.request().id(), request.request().routing(), request.request().preference() ); diff --git a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java index aa9d806c812cb..2816a655bb7e3 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java @@ -23,8 +23,6 @@ import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Terms; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.ActionFilters; @@ -126,7 +124,7 @@ protected FieldStatsShardResponse newShardResponse() { } @Override - protected FieldStatsShardResponse shardOperation(FieldStatsShardRequest request) throws ElasticsearchException { + protected FieldStatsShardResponse shardOperation(FieldStatsShardRequest request) { ShardId shardId = request.shardId(); Map fieldStats = new HashMap<>(); IndexService indexServices = indicesService.indexServiceSafe(shardId.getIndex()); diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java index e4c8c22d0bdfe..67c6141273c78 100644 --- a/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java +++ b/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.get; import com.google.common.collect.Iterators; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java index 469d5d52d41b2..939f5c3b27c09 100644 --- a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java +++ b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java @@ -89,7 +89,7 @@ protected void resolveRequest(ClusterState state, InternalRequest request) { } @Override - protected GetResponse shardOperation(GetRequest request, ShardId shardId) throws ElasticsearchException { + protected GetResponse shardOperation(GetRequest request, ShardId shardId) { IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex()); IndexShard indexShard = indexService.shardSafe(shardId.id()); diff --git a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java index 246ba1f93d83d..fb6bac8cdc843 100644 --- a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java +++ b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java @@ -84,7 +84,7 @@ protected void resolveRequest(ClusterState state, InternalRequest request) { } @Override - protected MultiGetShardResponse shardOperation(MultiGetShardRequest request, ShardId shardId) throws ElasticsearchException { + protected MultiGetShardResponse shardOperation(MultiGetShardRequest request, ShardId shardId) { IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex()); IndexShard indexShard = indexService.shardSafe(shardId.id()); diff --git a/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/src/main/java/org/elasticsearch/action/index/IndexRequest.java index b8d3026feac3d..1f766b7a174c8 100644 --- a/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -22,7 +22,6 @@ import com.google.common.base.Charsets; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.action.support.replication.ShardReplicationOperationRequest; @@ -113,7 +112,7 @@ public static OpType fromId(byte id) { } } - public static OpType fromString(String sOpType) throws IllegalArgumentException { + public static OpType fromString(String sOpType) { String lowersOpType = sOpType.toLowerCase(Locale.ROOT); switch(lowersOpType){ case "create": @@ -490,7 +489,7 @@ public IndexRequest opType(OpType opType) { * Sets a string representation of the {@link #opType(org.elasticsearch.action.index.IndexRequest.OpType)}. Can * be either "index" or "create". */ - public IndexRequest opType(String opType) throws IllegalArgumentException { + public IndexRequest opType(String opType) { return opType(OpType.fromString(opType)); } @@ -559,7 +558,7 @@ public boolean autoGeneratedId() { return this.autoGeneratedId; } - public void process(MetaData metaData, @Nullable MappingMetaData mappingMd, boolean allowIdGeneration, String concreteIndex) throws ElasticsearchException { + public void process(MetaData metaData, @Nullable MappingMetaData mappingMd, boolean allowIdGeneration, String concreteIndex) { // resolve the routing if needed routing(metaData.resolveIndexRouting(routing, index)); // resolve timestamp if provided externally diff --git a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java index 88be29f5de156..b0d6bbb6c4142 100644 --- a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java +++ b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java @@ -21,7 +21,6 @@ import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.*; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchType; @@ -475,7 +474,7 @@ public MoreLikeThisRequest searchType(SearchType searchType) { /** * The search type of the mlt search query. */ - public MoreLikeThisRequest searchType(String searchType) throws IllegalArgumentException { + public MoreLikeThisRequest searchType(String searchType) { return searchType(SearchType.fromString(searchType)); } diff --git a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java index de3d5d73f2d93..ad8f7e43da05f 100644 --- a/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.mlt; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -213,7 +212,7 @@ public MoreLikeThisRequestBuilder setSearchType(SearchType searchType) { /** * The search type of the mlt search query. */ - public MoreLikeThisRequestBuilder setSearchType(String searchType) throws IllegalArgumentException { + public MoreLikeThisRequestBuilder setSearchType(String searchType) { request.searchType(searchType); return this; } diff --git a/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java b/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java index 2c0fa335043bc..ab119e169f010 100644 --- a/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java +++ b/src/main/java/org/elasticsearch/action/mlt/TransportMoreLikeThisAction.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java b/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java index 4649a9f9b8b06..d5df34368d2b8 100644 --- a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java +++ b/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.percolate; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java index 46005f30dc8f5..e08cce30d43dc 100644 --- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java +++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java @@ -173,7 +173,7 @@ protected GroupShardsIterator shards(ClusterState clusterState, PercolateRequest } @Override - protected PercolateShardResponse shardOperation(PercolateShardRequest request) throws ElasticsearchException { + protected PercolateShardResponse shardOperation(PercolateShardRequest request) { try { return percolatorService.percolate(request); } catch (Throwable e) { diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java index f221f75823316..ce38859174fbe 100644 --- a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java +++ b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java @@ -78,14 +78,14 @@ protected boolean resolveIndex() { } @Override - protected ShardIterator shards(ClusterState state, InternalRequest request) throws ElasticsearchException { + protected ShardIterator shards(ClusterState state, InternalRequest request) { return clusterService.operationRouting().getShards( state, request.concreteIndex(), request.request().shardId(), request.request().preference ); } @Override - protected Response shardOperation(Request request, ShardId shardId) throws ElasticsearchException { + protected Response shardOperation(Request request, ShardId shardId) { // TODO: Look into combining the shard req's docs into one in memory index. Response response = new Response(); response.items = new ArrayList<>(request.items.size()); diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java index 0208b519efee3..54f8c861bea99 100644 --- a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java +++ b/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.search; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 8fee22267c28a..8e1da31affa74 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.search; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; @@ -241,7 +240,7 @@ public SearchRequest searchType(SearchType searchType) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", and "query_and_fetch"/"queryAndFetch". */ - public SearchRequest searchType(String searchType) throws IllegalArgumentException { + public SearchRequest searchType(String searchType) { return searchType(SearchType.fromString(searchType)); } diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index 0ea1b41a5dd80..0a96133201d64 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequestBuilder; @@ -86,7 +85,7 @@ public SearchRequestBuilder setSearchType(SearchType searchType) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", and "query_and_fetch"/"queryAndFetch". */ - public SearchRequestBuilder setSearchType(String searchType) throws IllegalArgumentException { + public SearchRequestBuilder setSearchType(String searchType) { request.searchType(searchType); return this; } diff --git a/src/main/java/org/elasticsearch/action/search/SearchType.java b/src/main/java/org/elasticsearch/action/search/SearchType.java index 543ffe614234c..f31232a6a25af 100644 --- a/src/main/java/org/elasticsearch/action/search/SearchType.java +++ b/src/main/java/org/elasticsearch/action/search/SearchType.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; /** @@ -109,7 +108,7 @@ public static SearchType fromId(byte id) { * one of "dfs_query_then_fetch"/"dfsQueryThenFetch", "dfs_query_and_fetch"/"dfsQueryAndFetch", * "query_then_fetch"/"queryThenFetch", "query_and_fetch"/"queryAndFetch", and "scan". */ - public static SearchType fromString(String searchType) throws IllegalArgumentException { + public static SearchType fromString(String searchType) { if (searchType == null) { return SearchType.DEFAULT; } diff --git a/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index ade70551844a9..5cfba631ce141 100644 --- a/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.type.*; import org.elasticsearch.action.support.ActionFilters; diff --git a/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java index 4b4920e6e028a..0a36b6664e8e0 100644 --- a/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java +++ b/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.type.ParsedScrollId; import org.elasticsearch.action.search.type.TransportSearchScrollQueryAndFetchAction; diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java index ec9f927038907..0f8da3a8ade2e 100644 --- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java +++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java @@ -23,8 +23,6 @@ import com.google.common.collect.Maps; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.search.SearchType; diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java index f2d6340fd4056..e2cf4d87f5340 100644 --- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java +++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.NoShardAvailableActionException; import org.elasticsearch.action.search.ReduceSearchPhaseException; diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java index 2054cad61cb94..7d69af266b3f4 100644 --- a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java +++ b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.suggest; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; @@ -128,7 +127,7 @@ protected SuggestResponse newResponse(SuggestRequest request, AtomicReferenceArr } @Override - protected ShardSuggestResponse shardOperation(ShardSuggestRequest request) throws ElasticsearchException { + protected ShardSuggestResponse shardOperation(ShardSuggestRequest request) { IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex()); IndexShard indexShard = indexService.shardSafe(request.shardId().id()); final Engine.Searcher searcher = indexShard.acquireSearcher("suggest"); diff --git a/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java index 98dca680ef566..e1da5ee41f5ce 100644 --- a/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java +++ b/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.support; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; @@ -40,7 +39,7 @@ public abstract class AdapterActionFuture extends BaseFuture implements private Throwable rootFailure; @Override - public T actionGet() throws ElasticsearchException { + public T actionGet() { try { return get(); } catch (InterruptedException e) { @@ -51,22 +50,22 @@ public T actionGet() throws ElasticsearchException { } @Override - public T actionGet(String timeout) throws ElasticsearchException { + public T actionGet(String timeout) { return actionGet(TimeValue.parseTimeValue(timeout, null)); } @Override - public T actionGet(long timeoutMillis) throws ElasticsearchException { + public T actionGet(long timeoutMillis) { return actionGet(timeoutMillis, TimeUnit.MILLISECONDS); } @Override - public T actionGet(TimeValue timeout) throws ElasticsearchException { + public T actionGet(TimeValue timeout) { return actionGet(timeout.millis(), TimeUnit.MILLISECONDS); } @Override - public T actionGet(long timeout, TimeUnit unit) throws ElasticsearchException { + public T actionGet(long timeout, TimeUnit unit) { try { return get(timeout, unit); } catch (TimeoutException e) { diff --git a/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java b/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java index 5d32b631ae69b..9722bef59903c 100644 --- a/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java +++ b/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.settings.NodeSettingsService; diff --git a/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/src/main/java/org/elasticsearch/action/support/IndicesOptions.java index ccd458acb1fd6..c46a00720e55c 100644 --- a/src/main/java/org/elasticsearch/action/support/IndicesOptions.java +++ b/src/main/java/org/elasticsearch/action/support/IndicesOptions.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.action.support; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/action/support/TransportAction.java b/src/main/java/org/elasticsearch/action/support/TransportAction.java index 4637ba00c5811..7d3f356469354 100644 --- a/src/main/java/org/elasticsearch/action/support/TransportAction.java +++ b/src/main/java/org/elasticsearch/action/support/TransportAction.java @@ -47,7 +47,7 @@ protected TransportAction(Settings settings, String actionName, ThreadPool threa this.threadPool = threadPool; } - public final ActionFuture execute(Request request) throws ElasticsearchException { + public final ActionFuture execute(Request request) { PlainActionFuture future = newFuture(); // since we don't have a listener, and we release a possible lock with the future // there is no need to execute it under a listener thread diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java index 9c8f8ce065c9d..b0bcad2e86b95 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java @@ -75,7 +75,7 @@ protected void doExecute(Request request, ActionListener listener) { protected abstract ShardResponse newShardResponse(); - protected abstract ShardResponse shardOperation(ShardRequest request) throws ElasticsearchException; + protected abstract ShardResponse shardOperation(ShardRequest request); /** * Determines the shards this operation will be executed on. The operation is executed once per shard iterator, typically diff --git a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java index 45a21a60ea336..8ecff553bceb1 100644 --- a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java +++ b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java @@ -44,10 +44,10 @@ protected String executor() { } @Override - protected final void masterOperation(final Request request, final ClusterState state, final ActionListener listener) throws ElasticsearchException { + protected final void masterOperation(final Request request, final ClusterState state, final ActionListener listener) { String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices()); doMasterOperation(request, concreteIndices, state, listener); } - protected abstract void doMasterOperation(Request request, String[] concreteIndices, ClusterState state, final ActionListener listener) throws ElasticsearchException; + protected abstract void doMasterOperation(Request request, String[] concreteIndices, ClusterState state, final ActionListener listener); } diff --git a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java index 65bdaeb7c26c5..9331a5d4a65ab 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java @@ -76,7 +76,7 @@ protected boolean transportCompress() { protected abstract NodeResponse newNodeResponse(); - protected abstract NodeResponse nodeOperation(NodeRequest request) throws ElasticsearchException; + protected abstract NodeResponse nodeOperation(NodeRequest request); protected abstract boolean accumulateExceptions(); diff --git a/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java b/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java index ce26311d5fac1..0e488a602ff28 100644 --- a/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java @@ -126,7 +126,7 @@ protected void doExecute(Request request, ActionListener listener) { protected abstract void shardOperationOnReplica(ShardId shardId, ReplicaRequest shardRequest); - protected abstract ShardIterator shards(ClusterState clusterState, InternalRequest request) throws ElasticsearchException; + protected abstract ShardIterator shards(ClusterState clusterState, InternalRequest request); protected abstract boolean checkWriteConsistency(); diff --git a/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java index ada9ccfbf50c2..cb2376d3230f1 100644 --- a/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java @@ -75,7 +75,7 @@ protected void doExecute(Request request, ActionListener listener) { * Operation to be executed at the shard level. Can be called with shardId set to null, meaning that there is no * shard involved and the operation just needs to be executed on the local node. */ - protected abstract Response shardOperation(Request request, ShardId shardId) throws ElasticsearchException; + protected abstract Response shardOperation(Request request, ShardId shardId); protected abstract Response newResponse(); diff --git a/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java index 2c54b3ef8e8a2..d4190aca619b9 100644 --- a/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java @@ -69,7 +69,7 @@ protected void doExecute(Request request, ActionListener listener) { protected abstract String executor(); - protected abstract void shardOperation(InternalRequest request, ActionListener listener) throws ElasticsearchException; + protected abstract void shardOperation(InternalRequest request, ActionListener listener); protected abstract Response newResponse(); @@ -97,7 +97,7 @@ protected TransportRequestOptions transportOptions() { /** * Should return an iterator with a single shard! */ - protected abstract ShardIterator shards(ClusterState clusterState, InternalRequest request) throws ElasticsearchException; + protected abstract ShardIterator shards(ClusterState clusterState, InternalRequest request); class AsyncSingleAction { @@ -118,7 +118,7 @@ public void start() { doStart(); } - protected boolean doStart() throws ElasticsearchException { + protected boolean doStart() { nodes = observer.observedState().nodes(); try { ClusterBlockException blockException = checkGlobalBlock(observer.observedState()); diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java index 01c7dd66a6148..1c91a7753dd15 100644 --- a/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java @@ -83,7 +83,7 @@ protected void doExecute(Request request, ActionListener listener) { new AsyncSingleAction(request, listener).start(); } - protected abstract Response shardOperation(Request request, ShardId shardId) throws ElasticsearchException; + protected abstract Response shardOperation(Request request, ShardId shardId); protected abstract Response newResponse(); @@ -101,7 +101,7 @@ protected void resolveRequest(ClusterState state, InternalRequest request) { } - protected abstract ShardIterator shards(ClusterState state, InternalRequest request) throws ElasticsearchException; + protected abstract ShardIterator shards(ClusterState state, InternalRequest request); class AsyncSingleAction { diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java index 858b55d1c5bee..3cde0f41ce5ed 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.termvectors; import com.google.common.collect.Iterators; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.*; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java index 86e98293153ed..8905e10db4f79 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java @@ -28,7 +28,6 @@ import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest.Flag; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java index 7a27d73d89946..f2e9a16d98952 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java @@ -72,7 +72,7 @@ protected ShardIterator shards(ClusterState state, InternalRequest request) { } @Override - protected MultiTermVectorsShardResponse shardOperation(MultiTermVectorsShardRequest request, ShardId shardId) throws ElasticsearchException { + protected MultiTermVectorsShardResponse shardOperation(MultiTermVectorsShardRequest request, ShardId shardId) { MultiTermVectorsShardResponse response = new MultiTermVectorsShardResponse(); for (int i = 0; i < request.locations.size(); i++) { TermVectorsRequest termVectorsRequest = request.requests.get(i); diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java index 4d610ccdc59be..7dccb0f3fb06b 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java @@ -79,7 +79,7 @@ protected void resolveRequest(ClusterState state, InternalRequest request) { } @Override - protected TermVectorsResponse shardOperation(TermVectorsRequest request, ShardId shardId) throws ElasticsearchException { + protected TermVectorsResponse shardOperation(TermVectorsRequest request, ShardId shardId) { IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex()); IndexShard indexShard = indexService.shardSafe(shardId.id()); TermVectorsResponse response = indexShard.termVectorsService().getTermVectors(request, shardId.getIndex()); diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java index 9ac61f54cfcf7..2dca1a9049e6a 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java @@ -128,7 +128,7 @@ protected DfsOnlyResponse newResponse(DfsOnlyRequest request, AtomicReferenceArr } @Override - protected ShardDfsOnlyResponse shardOperation(ShardDfsOnlyRequest request) throws ElasticsearchException { + protected ShardDfsOnlyResponse shardOperation(ShardDfsOnlyRequest request) { DfsSearchResult dfsSearchResult = searchService.executeDfsPhase(request.getShardSearchRequest()); searchService.freeContext(dfsSearchResult.id()); return new ShardDfsOnlyResponse(request.shardId(), dfsSearchResult); diff --git a/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java index 31f2b4c53146f..135be162d4b2e 100644 --- a/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java +++ b/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; @@ -145,7 +144,7 @@ private void innerExecute(final UpdateRequest request, final ActionListener listener) throws ElasticsearchException { + protected void shardOperation(final InternalRequest request, final ActionListener listener) { shardOperation(request, listener, 0); } - protected void shardOperation(final InternalRequest request, final ActionListener listener, final int retryCount) throws ElasticsearchException { + protected void shardOperation(final InternalRequest request, final ActionListener listener, final int retryCount) { IndexService indexService = indicesService.indexServiceSafe(request.concreteIndex()); IndexShard indexShard = indexService.shardSafe(request.request().shardId()); final UpdateHelper.Result result = updateHelper.prepare(request.request(), indexShard); diff --git a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index f60a09fcd1432..ea90ac33f0bae 100644 --- a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.update; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.client.Requests; diff --git a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java b/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java index 2f059ac2f41ce..44c6dc3a4ab2b 100644 --- a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java +++ b/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java @@ -20,7 +20,6 @@ package org.elasticsearch.cache.recycler; import com.google.common.base.Strings; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.recycler.AbstractRecyclerC; diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/src/main/java/org/elasticsearch/client/transport/TransportClient.java index ad42cb764eba4..6dd30b02af3a1 100644 --- a/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/src/main/java/org/elasticsearch/client/transport/TransportClient.java @@ -107,7 +107,7 @@ public class TransportClient extends AbstractClient { * Constructs a new transport client with settings loaded either from the classpath or the file system (the * elasticsearch.(yml|json) files optionally prefixed with config/). */ - public TransportClient() throws ElasticsearchException { + public TransportClient() { this(ImmutableSettings.Builder.EMPTY_SETTINGS, true); } @@ -136,7 +136,7 @@ public TransportClient(Settings.Builder settings) { * @param loadConfigSettings true if settings should be loaded from the classpath/file system. * @throws org.elasticsearch.ElasticsearchException */ - public TransportClient(Settings.Builder settings, boolean loadConfigSettings) throws ElasticsearchException { + public TransportClient(Settings.Builder settings, boolean loadConfigSettings) { this(settings.build(), loadConfigSettings); } @@ -149,7 +149,7 @@ public TransportClient(Settings.Builder settings, boolean loadConfigSettings) th * @param loadConfigSettings true if settings should be loaded from the classpath/file system. * @throws org.elasticsearch.ElasticsearchException */ - public TransportClient(Settings pSettings, boolean loadConfigSettings) throws ElasticsearchException { + public TransportClient(Settings pSettings, boolean loadConfigSettings) { Tuple tuple = InternalSettingsPreparer.prepareSettings(pSettings, loadConfigSettings); Settings settings = settingsBuilder() .put(NettyTransport.PING_SCHEDULE, "5s") // enable by default the transport schedule ping interval diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java index 4fe1d48a2e98a..e2cf962f65aa3 100644 --- a/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java +++ b/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java @@ -24,7 +24,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; @@ -196,7 +195,7 @@ public TransportClientNodesService removeTransportAddress(TransportAddress trans return this; } - public void execute(NodeListenerCallback callback, ActionListener listener) throws ElasticsearchException { + public void execute(NodeListenerCallback callback, ActionListener listener) { ImmutableList nodes = this.nodes; ensureNodesAreAvailable(nodes); int index = getNodeNumber(); diff --git a/src/main/java/org/elasticsearch/cluster/ClusterService.java b/src/main/java/org/elasticsearch/cluster/ClusterService.java index bf351e46758f8..4ee9afb3e98f2 100644 --- a/src/main/java/org/elasticsearch/cluster/ClusterService.java +++ b/src/main/java/org/elasticsearch/cluster/ClusterService.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.OperationRouting; diff --git a/src/main/java/org/elasticsearch/cluster/ClusterState.java b/src/main/java/org/elasticsearch/cluster/ClusterState.java index 1f1b8769efae2..b90bc0bb2acac 100644 --- a/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -22,7 +22,6 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableSet; -import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlocks; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -103,7 +102,7 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) { Custom.Factory factory = customFactories.get(type); if (factory == null) { throw new IllegalArgumentException("No custom state factory registered for type [" + type + "]"); diff --git a/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java index 532f829a06f05..2010f67d70336 100644 --- a/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java +++ b/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.action.index; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -133,4 +132,4 @@ public static interface MappingUpdateListener { void onFailure(Throwable t); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java index c153bf09b2488..1bf3d3b6b90f7 100644 --- a/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java +++ b/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java @@ -72,7 +72,7 @@ public void remove(Listener listener) { listeners.remove(listener); } - public void nodeIndexDeleted(final ClusterState clusterState, final String index, final Settings indexSettings, final String nodeId) throws ElasticsearchException { + public void nodeIndexDeleted(final ClusterState clusterState, final String index, final Settings indexSettings, final String nodeId) { final DiscoveryNodes nodes = clusterState.nodes(); transportService.sendRequest(clusterState.nodes().masterNode(), INDEX_DELETED_ACTION_NAME, new NodeIndexDeletedMessage(index, nodeId), EmptyTransportResponseHandler.INSTANCE_SAME); diff --git a/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java index 794e577585235..5623dd96d6fdd 100644 --- a/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java +++ b/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java @@ -55,7 +55,7 @@ public NodeMappingRefreshAction(Settings settings, TransportService transportSer transportService.registerRequestHandler(ACTION_NAME, NodeMappingRefreshRequest.class, ThreadPool.Names.SAME, new NodeMappingRefreshTransportHandler()); } - public void nodeMappingRefresh(final ClusterState state, final NodeMappingRefreshRequest request) throws ElasticsearchException { + public void nodeMappingRefresh(final ClusterState state, final NodeMappingRefreshRequest request) { final DiscoveryNodes nodes = state.nodes(); if (nodes.masterNode() == null) { logger.warn("can't send mapping refresh for [{}][{}], no master known.", request.index(), Strings.arrayToCommaDelimitedString(request.types())); diff --git a/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index 7630306ebe172..ecbc27bd26677 100644 --- a/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -76,7 +76,7 @@ public ShardStateAction(Settings settings, ClusterService clusterService, Transp transportService.registerRequestHandler(SHARD_FAILED_ACTION_NAME, ShardRoutingEntry.class, ThreadPool.Names.SAME, new ShardFailedTransportHandler()); } - public void shardFailed(final ShardRouting shardRouting, final String indexUUID, final String reason) throws ElasticsearchException { + public void shardFailed(final ShardRouting shardRouting, final String indexUUID, final String reason) { DiscoveryNode masterNode = clusterService.state().nodes().masterNode(); if (masterNode == null) { logger.warn("can't send shard failed for {}, no master known.", shardRouting); @@ -85,7 +85,7 @@ public void shardFailed(final ShardRouting shardRouting, final String indexUUID, innerShardFailed(shardRouting, indexUUID, reason, masterNode); } - public void resendShardFailed(final ShardRouting shardRouting, final String indexUUID, final String reason, final DiscoveryNode masterNode) throws ElasticsearchException { + public void resendShardFailed(final ShardRouting shardRouting, final String indexUUID, final String reason, final DiscoveryNode masterNode) { logger.trace("{} re-sending failed shard for {}, indexUUID [{}], reason [{}]", shardRouting.shardId(), shardRouting, indexUUID, reason); innerShardFailed(shardRouting, indexUUID, reason, masterNode); } @@ -101,7 +101,7 @@ public void handleException(TransportException exp) { }); } - public void shardStarted(final ShardRouting shardRouting, String indexUUID, final String reason) throws ElasticsearchException { + public void shardStarted(final ShardRouting shardRouting, String indexUUID, final String reason) { DiscoveryNode masterNode = clusterService.state().nodes().masterNode(); if (masterNode == null) { logger.warn("can't send shard started for {}. no master known.", shardRouting); @@ -110,7 +110,7 @@ public void shardStarted(final ShardRouting shardRouting, String indexUUID, fina shardStarted(shardRouting, indexUUID, reason, masterNode); } - public void shardStarted(final ShardRouting shardRouting, String indexUUID, final String reason, final DiscoveryNode masterNode) throws ElasticsearchException { + public void shardStarted(final ShardRouting shardRouting, String indexUUID, final String reason, final DiscoveryNode masterNode) { ShardRoutingEntry shardRoutingEntry = new ShardRoutingEntry(shardRouting, indexUUID, reason); diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java index 3fc77b4ee4c26..45ff1d3707bcf 100644 --- a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java +++ b/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.block; -import java.lang.IllegalArgumentException; import java.util.EnumSet; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java index 5d2156ef56ed3..878082bf318fd 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java index 8a5ae1b128a47..e774f0d82ce3a 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.metadata; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.common.Strings; import org.elasticsearch.common.component.AbstractComponent; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index 8cea5faf7a40d..b9713727d6eb3 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -22,8 +22,6 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -109,7 +107,7 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) { Custom.Factory factory = customFactories.get(type); if (factory == null) { throw new IllegalArgumentException("No custom index metadata factoy registered for type [" + type + "]"); diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java index 6dc595be51c1e..f80c6072bfc9c 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.metadata; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.TimestampParsingException; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java index 7dd6dc8f7bf7f..ea25a6d525660 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java @@ -25,7 +25,6 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.base.Predicate; import com.google.common.collect.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -116,7 +115,7 @@ public static Custom.Factory lookupFactory(String type) { return customFactories.get(type); } - public static Custom.Factory lookupFactorySafe(String type) throws IllegalArgumentException { + public static Custom.Factory lookupFactorySafe(String type) { Custom.Factory factory = customFactories.get(type); if (factory == null) { throw new IllegalArgumentException("No custom index metadata factory registered for type [" + type + "]"); diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 67ddf9ea81b34..9fcb5182180b6 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -26,7 +26,6 @@ import com.google.common.collect.Maps; import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; @@ -156,7 +155,7 @@ public void doRun() throws InterruptedException { }); } - public void validateIndexName(String index, ClusterState state) throws ElasticsearchException { + public void validateIndexName(String index, ClusterState state) { if (state.routingTable().hasIndex(index)) { throw new IndexAlreadyExistsException(new Index(index)); } @@ -551,7 +550,7 @@ public int compare(IndexTemplateMetaData o1, IndexTemplateMetaData o2) { return templates; } - private void validate(CreateIndexClusterStateUpdateRequest request, ClusterState state) throws ElasticsearchException { + private void validate(CreateIndexClusterStateUpdateRequest request, ClusterState state) { validateIndexName(request.index(), state); validateIndexSettings(request.index(), request.settings()); } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java index 8377f3ae41d98..625c8d6e83990 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.metadata; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.close.CloseIndexClusterStateUpdateRequest; import org.elasticsearch.action.admin.indices.open.OpenIndexClusterStateUpdateRequest; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java index 66ac3b17fb6d2..755d0077c139d 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java @@ -23,7 +23,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.support.master.MasterNodeOperationRequest; import org.elasticsearch.cluster.ClusterService; @@ -178,7 +177,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS }); } - private void validate(PutRequest request) throws ElasticsearchException { + private void validate(PutRequest request) { if (request.name.contains(" ")) { throw new InvalidIndexTemplateException(request.name, "name must not contain a space"); } diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java index 3caa1a9e0e41f..8b4e334badef7 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.metadata; import com.google.common.collect.Sets; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsClusterStateUpdateRequest; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java index 51aa9198e2fa3..642136d7b7e4b 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java index 1622c2478126b..b1bcc92b8bd38 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index 0ea050c2fe833..915f0d5599d88 100644 --- a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java index ec2a6abc40258..2831af8183da8 100644 --- a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java +++ b/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java @@ -24,7 +24,6 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableList; import com.google.common.collect.UnmodifiableIterator; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java index afa92bae30d04..de4ed5434e1ab 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java +++ b/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java @@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.collect.UnmodifiableIterator; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.collect.ImmutableOpenIntMap; diff --git a/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java index 9f55d7d889380..ef46b6e8875e1 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java +++ b/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/main/java/org/elasticsearch/cluster/routing/Preference.java b/src/main/java/org/elasticsearch/cluster/routing/Preference.java index 480ea70015796..e8842f0de3e20 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/Preference.java +++ b/src/main/java/org/elasticsearch/cluster/routing/Preference.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.cluster.routing; -import java.lang.IllegalArgumentException; /** * Routing Preference Type diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java index 9231f0782b43b..deb25938f19dc 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java +++ b/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing; import com.google.common.collect.Iterators; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import java.util.ArrayList; diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java index 21378f22b99f3..33804559e4da8 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java +++ b/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java @@ -75,15 +75,15 @@ public RoutingService(Settings settings, ThreadPool threadPool, ClusterService c } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { FutureUtils.cancel(scheduledRoutingTableFuture); scheduledRoutingTableFuture = null; clusterService.remove(this); diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java index d5a1f25f98404..b36e1fcc88a9a 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java +++ b/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.routing; -import java.lang.IllegalStateException; /** * Represents the current state of a {@link ShardRouting} as defined by the diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java index 21aa3f821646a..8e6b68ecf7881 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -119,7 +118,7 @@ public RoutingAllocation.Result reroute(ClusterState clusterState, AllocationCom return reroute(clusterState, commands, false); } - public RoutingAllocation.Result reroute(ClusterState clusterState, AllocationCommands commands, boolean explain) throws ElasticsearchException { + public RoutingAllocation.Result reroute(ClusterState clusterState, AllocationCommands commands, boolean explain) { RoutingNodes routingNodes = clusterState.routingNodes(); // we don't shuffle the unassigned shards here, to try and get as close as possible to // a consistent result of the effect the commands have on the routing diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java index 941cae71c9816..11f3e45653f08 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java @@ -22,7 +22,6 @@ import com.google.common.base.Predicate; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IntroSorter; -import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingNode; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java index 515d0a60e9fd8..18e729aba895c 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java @@ -20,8 +20,6 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -167,7 +165,7 @@ public boolean allowPrimary() { } @Override - public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) throws ElasticsearchException { + public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) { DiscoveryNode discoNode = allocation.nodes().resolveNode(node); MutableShardRouting shardRouting = null; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java index d53151c5dbd50..1e835dc4039e1 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java @@ -88,5 +88,5 @@ interface Factory { * @param allocation {@link RoutingAllocation} to modify * @throws org.elasticsearch.ElasticsearchException if something happens during reconfiguration */ - RerouteExplanation execute(RoutingAllocation allocation, boolean explain) throws ElasticsearchException; + RerouteExplanation execute(RoutingAllocation allocation, boolean explain); } diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java index f73a67115874f..db41a759d35bd 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java @@ -19,8 +19,6 @@ package org.elasticsearch.cluster.routing.allocation.command; -import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.routing.allocation.RoutingExplanations; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; @@ -61,7 +59,7 @@ public static AllocationCommand.Factory lookupF } @SuppressWarnings("unchecked") - public static AllocationCommand.Factory lookupFactorySafe(String name) throws IllegalArgumentException { + public static AllocationCommand.Factory lookupFactorySafe(String name) { AllocationCommand.Factory factory = factories.get(name); if (factory == null) { throw new IllegalArgumentException("No allocation command factory registered for name [" + name + "]"); @@ -113,7 +111,7 @@ public List commands() { * @param allocation {@link RoutingAllocation} to apply this command to * @throws org.elasticsearch.ElasticsearchException if something happens during execution */ - public RoutingExplanations execute(RoutingAllocation allocation, boolean explain) throws ElasticsearchException { + public RoutingExplanations execute(RoutingAllocation allocation, boolean explain) { RoutingExplanations explanations = new RoutingExplanations(); for (AllocationCommand command : commands) { explanations.add(command.execute(allocation, explain)); diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java index 6ba8c88d21b3a..5d7a93635b415 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -165,7 +164,7 @@ public boolean allowPrimary() { } @Override - public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) throws ElasticsearchException { + public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) { DiscoveryNode discoNode = allocation.nodes().resolveNode(node); boolean found = false; for (RoutingNodes.RoutingNodeIterator it = allocation.routingNodes().routingNodeIter(discoNode.id()); it.hasNext(); ) { diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java index bdfad07a9cdab..185e74443e178 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing.allocation.command; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.MutableShardRouting; @@ -147,7 +146,7 @@ public String toNode() { } @Override - public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) throws ElasticsearchException { + public RerouteExplanation execute(RoutingAllocation allocation, boolean explain) { DiscoveryNode fromDiscoNode = allocation.nodes().resolveNode(fromNode); DiscoveryNode toDiscoNode = allocation.nodes().resolveNode(toNode); Decision decision = null; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java index 59ef855816dad..b057307cafbcf 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java @@ -19,8 +19,6 @@ package org.elasticsearch.cluster.routing.allocation.decider; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.settings.Validator; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java index 7068d3f0fd9f0..76922ae24624b 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing.allocation.decider; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java index 08fa64390df2c..7546482d87a32 100644 --- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java +++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java @@ -19,8 +19,6 @@ package org.elasticsearch.cluster.routing.allocation.decider; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; diff --git a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java index 21c6f1361d5ef..17350ba6c0427 100644 --- a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java +++ b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java @@ -21,7 +21,6 @@ import com.google.common.collect.Iterables; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.ClusterState.Builder; @@ -145,7 +144,7 @@ public void removeInitialStateBlock(ClusterBlock block) throws IllegalStateExcep } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { add(localNodeMasterListeners); this.clusterState = ClusterState.builder(clusterState).blocks(initialBlocks).build(); this.updateTasksExecutor = EsExecutors.newSinglePrioritizing(daemonThreadFactory(settings, UPDATE_THREAD_NAME)); @@ -160,7 +159,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { FutureUtils.cancel(this.reconnectToNodes); for (NotifyTimeout onGoingTimeout : onGoingTimeouts) { onGoingTimeout.cancel(); @@ -171,7 +170,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override @@ -756,4 +755,4 @@ public void onTimeout() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/common/Booleans.java b/src/main/java/org/elasticsearch/common/Booleans.java index f1422603a9976..280a7eec0769d 100644 --- a/src/main/java/org/elasticsearch/common/Booleans.java +++ b/src/main/java/org/elasticsearch/common/Booleans.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalArgumentException; /** * */ diff --git a/src/main/java/org/elasticsearch/common/ParseField.java b/src/main/java/org/elasticsearch/common/ParseField.java index 26ef60f656a8c..c863220d3d697 100644 --- a/src/main/java/org/elasticsearch/common/ParseField.java +++ b/src/main/java/org/elasticsearch/common/ParseField.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.common; -import java.lang.IllegalArgumentException; import java.util.EnumSet; import java.util.HashSet; diff --git a/src/main/java/org/elasticsearch/common/PidFile.java b/src/main/java/org/elasticsearch/common/PidFile.java index d208044b63c31..9afadf39275b0 100644 --- a/src/main/java/org/elasticsearch/common/PidFile.java +++ b/src/main/java/org/elasticsearch/common/PidFile.java @@ -20,7 +20,6 @@ import com.google.common.base.Charsets; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.monitor.jvm.JvmInfo; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/common/Preconditions.java b/src/main/java/org/elasticsearch/common/Preconditions.java index 88002ba22bc4e..0dee37534039d 100644 --- a/src/main/java/org/elasticsearch/common/Preconditions.java +++ b/src/main/java/org/elasticsearch/common/Preconditions.java @@ -19,8 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchNullPointerException; import java.util.NoSuchElementException; diff --git a/src/main/java/org/elasticsearch/common/Priority.java b/src/main/java/org/elasticsearch/common/Priority.java index c9233a08a4803..658a7e5e9e22e 100644 --- a/src/main/java/org/elasticsearch/common/Priority.java +++ b/src/main/java/org/elasticsearch/common/Priority.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.common; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java index 7992ddb693526..9a3c35f352742 100644 --- a/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java +++ b/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalStateException; import java.io.IOException; import java.util.Random; diff --git a/src/main/java/org/elasticsearch/common/Table.java b/src/main/java/org/elasticsearch/common/Table.java index 183e51c7ecadd..12a6dcc87dacf 100644 --- a/src/main/java/org/elasticsearch/common/Table.java +++ b/src/main/java/org/elasticsearch/common/Table.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import java.lang.IllegalStateException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java b/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java index 0561956552cfe..b45d17e20d525 100644 --- a/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java +++ b/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalStateException; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java index 394d2e6fbcdab..afd8efdb8b4ea 100644 --- a/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java +++ b/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.breaker; -import java.lang.IllegalArgumentException; import java.util.Locale; diff --git a/src/main/java/org/elasticsearch/common/bytes/BytesArray.java b/src/main/java/org/elasticsearch/common/bytes/BytesArray.java index aa2860eb2b3cc..9fc4098cad3ef 100644 --- a/src/main/java/org/elasticsearch/common/bytes/BytesArray.java +++ b/src/main/java/org/elasticsearch/common/bytes/BytesArray.java @@ -21,7 +21,6 @@ import com.google.common.base.Charsets; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.Channels; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java index ab3f1e8ae91d1..1bc370cd8943b 100644 --- a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java +++ b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java @@ -21,7 +21,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.Channels; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.netty.NettyUtils; diff --git a/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java b/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java index eb6bb60693397..8d4ac9068e76b 100644 --- a/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java +++ b/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java @@ -36,7 +36,7 @@ public ReleasablePagedBytesReference(BigArrays bigarrays, ByteArray bytearray, i } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(bytearray); } } diff --git a/src/main/java/org/elasticsearch/common/cli/CliTool.java b/src/main/java/org/elasticsearch/common/cli/CliTool.java index 092fd0e2e3a30..f2e08c5b1e568 100644 --- a/src/main/java/org/elasticsearch/common/cli/CliTool.java +++ b/src/main/java/org/elasticsearch/common/cli/CliTool.java @@ -23,7 +23,6 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.GnuParser; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; diff --git a/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/src/main/java/org/elasticsearch/common/collect/HppcMaps.java index 28cc9a5483c27..594b93df6a26f 100644 --- a/src/main/java/org/elasticsearch/common/collect/HppcMaps.java +++ b/src/main/java/org/elasticsearch/common/collect/HppcMaps.java @@ -23,7 +23,6 @@ import com.carrotsearch.hppc.ObjectLookupContainer; import com.carrotsearch.hppc.ObjectObjectOpenHashMap; import com.carrotsearch.hppc.cursors.ObjectCursor; -import java.lang.IllegalArgumentException; import java.util.Iterator; diff --git a/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java index d7f140655ee45..3bac87515a0db 100644 --- a/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java +++ b/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java @@ -59,7 +59,7 @@ public void removeLifecycleListener(LifecycleListener listener) { @SuppressWarnings({"unchecked"}) @Override - public T start() throws ElasticsearchException { + public T start() { if (!lifecycle.canMoveToStarted()) { return (T) this; } @@ -74,11 +74,11 @@ public T start() throws ElasticsearchException { return (T) this; } - protected abstract void doStart() throws ElasticsearchException; + protected abstract void doStart(); @SuppressWarnings({"unchecked"}) @Override - public T stop() throws ElasticsearchException { + public T stop() { if (!lifecycle.canMoveToStopped()) { return (T) this; } @@ -93,10 +93,10 @@ public T stop() throws ElasticsearchException { return (T) this; } - protected abstract void doStop() throws ElasticsearchException; + protected abstract void doStop(); @Override - public void close() throws ElasticsearchException { + public void close() { if (lifecycle.started()) { stop(); } @@ -113,5 +113,5 @@ public void close() throws ElasticsearchException { } } - protected abstract void doClose() throws ElasticsearchException; + protected abstract void doClose(); } diff --git a/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/src/main/java/org/elasticsearch/common/component/Lifecycle.java index 146a4adcb202c..e6cbf264af32c 100644 --- a/src/main/java/org/elasticsearch/common/component/Lifecycle.java +++ b/src/main/java/org/elasticsearch/common/component/Lifecycle.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.component; -import java.lang.IllegalStateException; /** * Lifecycle state. Allows the following transitions: diff --git a/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java b/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java index d8e72bd56d8b3..452f644462f19 100644 --- a/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java +++ b/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java @@ -35,7 +35,7 @@ public interface LifecycleComponent extends Releasable { void removeLifecycleListener(LifecycleListener listener); - T start() throws ElasticsearchException; + T start(); - T stop() throws ElasticsearchException; + T stop(); } diff --git a/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/src/main/java/org/elasticsearch/common/geo/GeoDistance.java index 0f44b5738a62a..fca809704397e 100644 --- a/src/main/java/org/elasticsearch/common/geo/GeoDistance.java +++ b/src/main/java/org/elasticsearch/common/geo/GeoDistance.java @@ -21,7 +21,6 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.SloppyMath; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.GeoPointValues; diff --git a/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java index 8e908012d8a1e..de37ddb4eb462 100644 --- a/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java +++ b/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java @@ -17,7 +17,6 @@ package org.elasticsearch.common.geo; -import java.lang.IllegalArgumentException; import java.util.ArrayList; import java.util.Collection; @@ -479,4 +478,4 @@ private static double[] decodeCell(long geohash) { } return interval; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java index ead682293b6d2..07ceaf1b7623b 100644 --- a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java +++ b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java @@ -27,7 +27,6 @@ import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.GeometryFactory; import org.apache.commons.lang3.tuple.Pair; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLoggerFactory; diff --git a/src/main/java/org/elasticsearch/common/lease/Releasable.java b/src/main/java/org/elasticsearch/common/lease/Releasable.java index 84b11fd049843..29ee1d59e6fa4 100644 --- a/src/main/java/org/elasticsearch/common/lease/Releasable.java +++ b/src/main/java/org/elasticsearch/common/lease/Releasable.java @@ -27,5 +27,5 @@ public interface Releasable extends AutoCloseable { @Override - void close() throws ElasticsearchException; + void close(); } diff --git a/src/main/java/org/elasticsearch/common/lease/Releasables.java b/src/main/java/org/elasticsearch/common/lease/Releasables.java index 0322d66adcc6c..c91494a235d84 100644 --- a/src/main/java/org/elasticsearch/common/lease/Releasables.java +++ b/src/main/java/org/elasticsearch/common/lease/Releasables.java @@ -104,7 +104,7 @@ public static Releasable wrap(final Iterable releasables) { return new Releasable() { @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(releasables); } @@ -116,7 +116,7 @@ public static Releasable wrap(final Releasable... releasables) { return new Releasable() { @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(releasables); } diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java index 991e74d308017..92593d1347966 100644 --- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -61,8 +61,6 @@ import org.apache.lucene.util.Counter; import org.apache.lucene.util.Version; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java b/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java index 77ef6feeb6496..fb6ebc28e1c39 100644 --- a/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java +++ b/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java @@ -20,7 +20,6 @@ package org.elasticsearch.common.lucene.all; import com.google.common.collect.Lists; -import java.lang.IllegalStateException; import org.elasticsearch.common.io.FastCharArrayWriter; import org.elasticsearch.common.io.FastStringReader; diff --git a/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java b/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java index 9afdc2dd90b6b..e05c11905ec35 100644 --- a/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java +++ b/src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java @@ -28,8 +28,6 @@ import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.RoaringDocIdSet; import org.apache.lucene.util.SparseFixedBitSet; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java index fc956703826f8..15a421567e5e5 100644 --- a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java +++ b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java @@ -31,7 +31,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.docset.DocIdSets; @@ -202,4 +201,4 @@ public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throw public BytesRef next() throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java b/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java index 8b33b3ef4ad77..a74b1b74645e7 100644 --- a/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java +++ b/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java @@ -103,7 +103,7 @@ public boolean seekExact(BytesRef text) throws IOException { @Override - public void close() throws ElasticsearchException { + public void close() { try { Releasables.close(cachedTermOrds, termDocFreqs, termsTotalFreqs); } finally { diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java b/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java index a1bc0d611083e..db651ab8012b1 100644 --- a/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java +++ b/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java @@ -21,7 +21,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; -import java.lang.IllegalArgumentException; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java index 179237a5d27fd..026711e231303 100644 --- a/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java +++ b/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.recycler; -import java.lang.IllegalStateException; import java.util.Deque; diff --git a/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java index 35a943da48c0d..258e4355b9f56 100644 --- a/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java +++ b/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.recycler; -import java.lang.IllegalStateException; /** */ diff --git a/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/src/main/java/org/elasticsearch/common/recycler/Recyclers.java index 67f29c21130f1..4344a0689c102 100644 --- a/src/main/java/org/elasticsearch/common/recycler/Recyclers.java +++ b/src/main/java/org/elasticsearch/common/recycler/Recyclers.java @@ -22,7 +22,6 @@ import com.carrotsearch.hppc.hash.MurmurHash3; import com.google.common.collect.Queues; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; public enum Recyclers { ; @@ -126,7 +125,7 @@ protected Recycler.V wrap(final Recycler.V delegate) { return new Recycler.V() { @Override - public void close() throws ElasticsearchException { + public void close() { synchronized (lock) { delegate.close(); } diff --git a/src/main/java/org/elasticsearch/common/regex/Regex.java b/src/main/java/org/elasticsearch/common/regex/Regex.java index 63bbb573227b1..f5c3094e31da6 100644 --- a/src/main/java/org/elasticsearch/common/regex/Regex.java +++ b/src/main/java/org/elasticsearch/common/regex/Regex.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.regex; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import java.util.Locale; diff --git a/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java b/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java index 98b7f0ecfb744..107324949db26 100644 --- a/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java +++ b/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.rounding; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; diff --git a/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java b/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java index 296a0e9b51358..8738d30e774e6 100644 --- a/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java +++ b/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java @@ -25,7 +25,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Classes; diff --git a/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java b/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java index c75cedd1d6a6c..f3aa0941d46ae 100644 --- a/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java +++ b/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java @@ -20,7 +20,6 @@ package org.elasticsearch.common.transport; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalStateException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.logging.ESLogger; diff --git a/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java index 37c76d2b86578..153417f869fca 100644 --- a/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java +++ b/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.unit; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -52,7 +51,7 @@ public ByteSizeValue(long size, ByteSizeUnit sizeUnit) { this.sizeUnit = sizeUnit; } - public int bytesAsInt() throws IllegalArgumentException { + public int bytesAsInt() { long bytes = bytes(); if (bytes > Integer.MAX_VALUE) { throw new IllegalArgumentException("size [" + toString() + "] is bigger than max int"); @@ -250,4 +249,4 @@ public int hashCode() { result = 31 * result + (sizeUnit != null ? sizeUnit.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java index 8ffec08d4c4b5..cb89ca83d514d 100644 --- a/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java +++ b/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.unit; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/src/main/java/org/elasticsearch/common/unit/Fuzziness.java index a1d1bb76d21ad..7ae494cabb948 100644 --- a/src/main/java/org/elasticsearch/common/unit/Fuzziness.java +++ b/src/main/java/org/elasticsearch/common/unit/Fuzziness.java @@ -20,7 +20,6 @@ import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.util.automaton.LevenshteinAutomata; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/common/util/BloomFilter.java b/src/main/java/org/elasticsearch/common/util/BloomFilter.java index 5137a04321035..8a2acba8d281c 100644 --- a/src/main/java/org/elasticsearch/common/util/BloomFilter.java +++ b/src/main/java/org/elasticsearch/common/util/BloomFilter.java @@ -25,7 +25,6 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.RamUsageEstimator; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.hash.MurmurHash3; diff --git a/src/main/java/org/elasticsearch/common/util/LocaleUtils.java b/src/main/java/org/elasticsearch/common/util/LocaleUtils.java index 65c99da43c59b..2e6c01a1ca726 100644 --- a/src/main/java/org/elasticsearch/common/util/LocaleUtils.java +++ b/src/main/java/org/elasticsearch/common/util/LocaleUtils.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util; -import java.lang.IllegalArgumentException; import java.util.Locale; diff --git a/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java index eff145ae80bd6..7949989c2a015 100644 --- a/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java +++ b/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java @@ -166,7 +166,7 @@ public Cursor next() { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(keys, values); } diff --git a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java index 527bb58f2b85f..1cb700cff6037 100644 --- a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java +++ b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java @@ -27,7 +27,6 @@ import org.apache.lucene.store.Lock; import org.apache.lucene.store.SimpleFSDirectory; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java b/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java index 29247e5939ccd..b2a80fc68dbf0 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util.concurrent; -import java.lang.IllegalArgumentException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java index 77f81b85d3948..8bb16869c47e3 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util.concurrent; -import java.lang.IllegalStateException; import org.elasticsearch.common.metrics.CounterMetric; import java.util.concurrent.BlockingQueue; diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java index 94d82b773622b..8e21065e2f4ae 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util.concurrent; -import java.lang.IllegalStateException; import java.util.concurrent.*; diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java index c9fb994985d89..fb62a62824423 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util.concurrent; -import java.lang.IllegalStateException; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java b/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java index 4d9796981617e..bff4ee613e16e 100644 --- a/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java +++ b/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.util.concurrent; -import java.lang.IllegalStateException; import java.util.AbstractQueue; import java.util.Collection; diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java index e43eb769e65a7..9ae1a03a67d21 100644 --- a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java +++ b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.dataformat.cbor.CBORConstants; import com.fasterxml.jackson.dataformat.smile.SmileConstants; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java index ccd2ca1ae2c6e..08174e30a3e6f 100644 --- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java +++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.core.JsonToken; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.AbstractXContentParser; diff --git a/src/main/java/org/elasticsearch/discovery/DiscoveryService.java b/src/main/java/org/elasticsearch/discovery/DiscoveryService.java index f73f2bbb5939b..1f7207abd5bcf 100644 --- a/src/main/java/org/elasticsearch/discovery/DiscoveryService.java +++ b/src/main/java/org/elasticsearch/discovery/DiscoveryService.java @@ -78,7 +78,7 @@ public ClusterBlock getNoMasterBlock() { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { initialStateListener = new InitialStateListener(); discovery.addListener(initialStateListener); discovery.start(); @@ -97,7 +97,7 @@ public void waitForInitialState() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { if (initialStateListener != null) { discovery.removeListener(initialStateListener); } @@ -105,7 +105,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { discovery.close(); } diff --git a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java index 95b1c0ba2d9be..e11bcd61a9676 100644 --- a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java +++ b/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java @@ -19,7 +19,6 @@ package org.elasticsearch.discovery; -import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.common.component.AbstractComponent; diff --git a/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java index c04cd6f8194e0..4686771aa3ad4 100644 --- a/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java @@ -21,7 +21,6 @@ import com.google.common.base.Objects; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlocks; @@ -99,7 +98,7 @@ public void setAllocationService(AllocationService allocationService) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { synchronized (clusterGroups) { ClusterGroup clusterGroup = clusterGroups.get(clusterName); if (clusterGroup == null) { @@ -192,7 +191,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { synchronized (clusterGroups) { ClusterGroup clusterGroup = clusterGroups.get(clusterName); if (clusterGroup == null) { @@ -250,7 +249,7 @@ public void onFailure(String source, Throwable t) { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java b/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java index 2f8ac0073d390..d78d22aa98345 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java +++ b/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.discovery.zen; -import java.lang.IllegalStateException; /** diff --git a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index d2271a92b6b62..0defcb7edd561 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -23,8 +23,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlocks; @@ -227,7 +225,7 @@ public void setAllocationService(AllocationService allocationService) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { nodesFD.setLocalNode(clusterService.localNode()); joinThreadControl.start(); pingService.start(); @@ -249,7 +247,7 @@ public void onFailure(String source, @org.elasticsearch.common.Nullable Throwabl } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { joinThreadControl.stop(); pingService.stop(); masterFD.stop("zen disco stop"); @@ -283,7 +281,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { masterFD.close(); nodesFD.close(); publishClusterState.close(); diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java index 06a726651303a..1159f1c4e6ad0 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java @@ -20,7 +20,6 @@ package org.elasticsearch.discovery.zen.fd; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java index 667c428992131..41a524b2629b9 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java +++ b/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java @@ -19,7 +19,6 @@ package org.elasticsearch.discovery.zen.fd; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; diff --git a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java index b245a6a0d3582..7a7567ea3b42a 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java +++ b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java @@ -87,7 +87,7 @@ public void sendLeaveRequest(DiscoveryNode masterNode, DiscoveryNode node) { transportService.sendRequest(node, DISCOVERY_LEAVE_ACTION_NAME, new LeaveRequest(masterNode), EmptyTransportResponseHandler.INSTANCE_SAME); } - public void sendLeaveRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node, TimeValue timeout) throws ElasticsearchException { + public void sendLeaveRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node, TimeValue timeout) { transportService.submitRequest(masterNode, DISCOVERY_LEAVE_ACTION_NAME, new LeaveRequest(node), EmptyTransportResponseHandler.INSTANCE_SAME).txGet(timeout.millis(), TimeUnit.MILLISECONDS); } @@ -95,7 +95,7 @@ public void sendJoinRequest(DiscoveryNode masterNode, DiscoveryNode node) { transportService.sendRequest(masterNode, DISCOVERY_JOIN_ACTION_NAME, new JoinRequest(node), EmptyTransportResponseHandler.INSTANCE_SAME); } - public void sendJoinRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node, TimeValue timeout) throws ElasticsearchException { + public void sendJoinRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node, TimeValue timeout) { transportService.submitRequest(masterNode, DISCOVERY_JOIN_ACTION_NAME, new JoinRequest(node), EmptyTransportResponseHandler.INSTANCE_SAME) .txGet(timeout.millis(), TimeUnit.MILLISECONDS); } @@ -103,7 +103,7 @@ public void sendJoinRequestBlocking(DiscoveryNode masterNode, DiscoveryNode node /** * Validates the join request, throwing a failure if it failed. */ - public void sendValidateJoinRequestBlocking(DiscoveryNode node, TimeValue timeout) throws ElasticsearchException { + public void sendValidateJoinRequestBlocking(DiscoveryNode node, TimeValue timeout) { transportService.submitRequest(node, DISCOVERY_JOIN_VALIDATE_ACTION_NAME, new ValidateJoinRequest(), EmptyTransportResponseHandler.INSTANCE_SAME) .txGet(timeout.millis(), TimeUnit.MILLISECONDS); } diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java index 370620a9b7bb6..18f734f713655 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java @@ -43,7 +43,7 @@ public interface ZenPing extends LifecycleComponent { void setPingContextProvider(PingContextProvider contextProvider); - void ping(PingListener listener, TimeValue timeout) throws ElasticsearchException; + void ping(PingListener listener, TimeValue timeout); public interface PingListener { diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java index ed32b22d37fb9..b7bd539c2f7f6 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.Nullable; @@ -79,21 +78,21 @@ public void setPingContextProvider(PingContextProvider contextProvider) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { for (ZenPing zenPing : zenPings) { zenPing.start(); } } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { for (ZenPing zenPing : zenPings) { zenPing.stop(); } } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { for (ZenPing zenPing : zenPings) { zenPing.close(); } @@ -119,7 +118,7 @@ public void onPing(PingResponse[] pings) { } @Override - public void ping(PingListener listener, TimeValue timeout) throws ElasticsearchException { + public void ping(PingListener listener, TimeValue timeout) { ImmutableList zenPings = this.zenPings; CompoundPingListener compoundPingListener = new CompoundPingListener(listener, zenPings); for (ZenPing zenPing : zenPings) { diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java index 8f06abcaca0b0..0d5ca7260b415 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java @@ -21,7 +21,6 @@ import org.apache.lucene.util.Constants; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; @@ -119,7 +118,7 @@ public void setPingContextProvider(PingContextProvider nodesProvider) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { try { // we know OSX has bugs in the JVM when creating multiple instances of multicast sockets // causing for "socket close" exceptions when receive and/or crashes @@ -138,7 +137,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { if (multicastChannel != null) { multicastChannel.close(); multicastChannel = null; @@ -146,7 +145,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } public PingResponse[] pingAndWait(TimeValue timeout) { diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java index 6842808c6696f..f9cf98f86fa81 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java @@ -23,8 +23,6 @@ import com.google.common.collect.Lists; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -142,15 +140,15 @@ public UnicastZenPing(Settings settings, ThreadPool threadPool, TransportService } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { transportService.removeHandler(ACTION_NAME); ThreadPool.terminate(unicastConnectExecutor, 0, TimeUnit.SECONDS); try { @@ -200,7 +198,7 @@ public void onPing(PingResponse[] pings) { } @Override - public void ping(final PingListener listener, final TimeValue timeout) throws ElasticsearchException { + public void ping(final PingListener listener, final TimeValue timeout) { final SendPingsHandler sendPingsHandler = new SendPingsHandler(pingHandlerIdGenerator.incrementAndGet()); try { receivedResponses.put(sendPingsHandler.id(), sendPingsHandler); diff --git a/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/src/main/java/org/elasticsearch/env/NodeEnvironment.java index 2b7db7d7937b9..134a15e3f7df2 100644 --- a/src/main/java/org/elasticsearch/env/NodeEnvironment.java +++ b/src/main/java/org/elasticsearch/env/NodeEnvironment.java @@ -23,8 +23,6 @@ import com.google.common.collect.Sets; import org.apache.lucene.store.*; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.component.AbstractComponent; diff --git a/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java index c67c91dd6b903..158a3df5d912a 100644 --- a/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java +++ b/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java @@ -20,7 +20,6 @@ package org.elasticsearch.gateway; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterState; diff --git a/src/main/java/org/elasticsearch/gateway/GatewayService.java b/src/main/java/org/elasticsearch/gateway/GatewayService.java index add9ea49f9cb8..da0b2bcabf8d7 100644 --- a/src/main/java/org/elasticsearch/gateway/GatewayService.java +++ b/src/main/java/org/elasticsearch/gateway/GatewayService.java @@ -102,7 +102,7 @@ public GatewayService(Settings settings, Gateway gateway, AllocationService allo } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { clusterService.addLast(this); // if we received initial state, see if we can recover within the start phase, so we hold the // node from starting until we recovered properly @@ -117,12 +117,12 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { clusterService.remove(this); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java index fe7bdd5ef7397..178b948f093ec 100644 --- a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java +++ b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexFormatTooOldException; import org.apache.lucene.store.*; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.logging.ESLogger; diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java index 77ab900ce90ba..36372009f87d3 100644 --- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java +++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java @@ -100,7 +100,7 @@ protected NodesGatewayMetaState newResponse(Request request, AtomicReferenceArra } @Override - protected NodeGatewayMetaState nodeOperation(NodeRequest request) throws ElasticsearchException { + protected NodeGatewayMetaState nodeOperation(NodeRequest request) { try { return new NodeGatewayMetaState(clusterService.localNode(), metaState.loadMetaState()); } catch (Exception e) { diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java index 4a812784e20e0..04b606cb09ada 100644 --- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java +++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java @@ -98,7 +98,7 @@ protected NodesGatewayStartedShards newResponse(Request request, AtomicReference } @Override - protected NodeGatewayStartedShards nodeOperation(NodeRequest request) throws ElasticsearchException { + protected NodeGatewayStartedShards nodeOperation(NodeRequest request) { try { final ShardId shardId = request.getShardId(); final String indexUUID = request.getIndexUUID(); diff --git a/src/main/java/org/elasticsearch/http/HttpServer.java b/src/main/java/org/elasticsearch/http/HttpServer.java index 6a84b0c04dc58..a055196b54beb 100644 --- a/src/main/java/org/elasticsearch/http/HttpServer.java +++ b/src/main/java/org/elasticsearch/http/HttpServer.java @@ -88,7 +88,7 @@ public void dispatchRequest(HttpRequest request, HttpChannel channel) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { transport.start(); if (logger.isInfoEnabled()) { logger.info("{}", transport.boundAddress()); @@ -97,13 +97,13 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { nodeService.removeAttribute("http_address"); transport.stop(); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { transport.close(); } diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java index 693e5049f5858..a727d3fed0fdc 100644 --- a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java +++ b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java @@ -209,7 +209,7 @@ public void httpServerAdapter(HttpServerAdapter httpServerAdapter) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { this.serverOpenChannels = new OpenChannelsHandler(logger); if (blockingServer) { @@ -286,7 +286,7 @@ public boolean onPortNumber(int portNumber) { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { if (serverChannel != null) { serverChannel.close().awaitUninterruptibly(); serverChannel = null; @@ -304,7 +304,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/main/java/org/elasticsearch/index/IndexService.java b/src/main/java/org/elasticsearch/index/IndexService.java index cc9a571cd9399..a0d30cc2f78b0 100644 --- a/src/main/java/org/elasticsearch/index/IndexService.java +++ b/src/main/java/org/elasticsearch/index/IndexService.java @@ -24,7 +24,6 @@ import com.google.common.collect.Iterators; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -272,7 +271,7 @@ public String indexUUID() { return indexSettings.get(IndexMetaData.SETTING_UUID, IndexMetaData.INDEX_UUID_NA_VALUE); } - public synchronized IndexShard createShard(int sShardId, boolean primary) throws ElasticsearchException { + public synchronized IndexShard createShard(int sShardId, boolean primary) { /* * TODO: we execute this in parallel but it's a synced method. Yet, we might * be able to serialize the execution via the cluster state in the future. for now we just @@ -355,7 +354,7 @@ public synchronized IndexShard createShard(int sShardId, boolean primary) throws } } - public synchronized void removeShard(int shardId, String reason) throws ElasticsearchException { + public synchronized void removeShard(int shardId, String reason) { final ShardId sId = new ShardId(index, shardId); final Injector shardInjector; final IndexShard indexShard; diff --git a/src/main/java/org/elasticsearch/index/VersionType.java b/src/main/java/org/elasticsearch/index/VersionType.java index ad31f4d17d05c..7800226c90c67 100644 --- a/src/main/java/org/elasticsearch/index/VersionType.java +++ b/src/main/java/org/elasticsearch/index/VersionType.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.uid.Versions; /** diff --git a/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/src/main/java/org/elasticsearch/index/analysis/Analysis.java index b994d5c230719..9570372c5aca6 100644 --- a/src/main/java/org/elasticsearch/index/analysis/Analysis.java +++ b/src/main/java/org/elasticsearch/index/analysis/Analysis.java @@ -58,7 +58,6 @@ import org.apache.lucene.analysis.tr.TurkishAnalyzer; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.MapBuilder; diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java index d6c881d2f1113..3b35156745618 100644 --- a/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java +++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java @@ -21,7 +21,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.Scopes; diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java index 055f399393614..dbbe01ae38f46 100644 --- a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java +++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.analysis.Analyzer; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java index 82cbd7316f0d9..5520a3c0e6447 100644 --- a/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java @@ -29,7 +29,6 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; -import java.lang.IllegalArgumentException; /** * diff --git a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java index d54b409749026..c98308d1ab1d0 100644 --- a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.ngram.Lucene43EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -89,4 +88,4 @@ protected boolean isTokenChar(int chr) { return new Lucene43EdgeNGramTokenizer(side, minGram, maxGram); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java index 9cfa70f284d0f..4281f959c1628 100644 --- a/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hunspell.Dictionary; import org.apache.lucene.analysis.hunspell.HunspellStemFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java index 60d907ee9d4f0..6b8e81f49535a 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java index eda197eb210cb..a92ade2467bf5 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.miscellaneous.Lucene43KeepWordFilter; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java index af5ee8baa1bd5..bc867218741b7 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.util.CharArraySet; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java index 1b38f8f36a61a..22862ff82f909 100644 --- a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.miscellaneous.LengthFilter; import org.apache.lucene.analysis.miscellaneous.Lucene43LengthFilter; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java index 9a5b26184c873..eb99bef6e6338 100644 --- a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.el.GreekLowerCaseFilter; import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java index d5a05155619fa..3bacfe4dff4be 100644 --- a/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java index 8a9eaebf52ede..b884095ae74ca 100644 --- a/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.ngram.Lucene43NGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; @@ -122,4 +121,4 @@ protected boolean isTokenChar(int chr) { } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java index 000b2b31d4af3..e1b58b3e376b1 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.path.PathHierarchyTokenizer; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java index 3b06a96baf2ac..e62055963168e 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.util.CharArraySet; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java index 80cd3e90c62b1..cefe288bbd4cd 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java index 5fb0d75f64d95..3a5cbdfbc6a28 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java index fef707fe68f7b..d40b8d6a4ddcb 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternReplaceFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.regex.Regex; @@ -55,4 +54,4 @@ public PatternReplaceTokenFilterFactory(Index index, @IndexSettings Settings ind public TokenStream create(TokenStream tokenStream) { return new PatternReplaceFilter(tokenStream, pattern, replacement, all); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java index f81eca7c4a1bc..283466f7fae95 100644 --- a/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.PatternTokenizer; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.regex.Regex; @@ -53,4 +52,4 @@ public PatternTokenizerFactory(Index index, @IndexSettings Settings indexSetting public Tokenizer create() { return new PatternTokenizer(pattern, group); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java index 8d871f0c0a8df..b0b4befa6db0c 100644 --- a/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; diff --git a/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java index 07fda901e1d51..2f2abd9aa1eec 100644 --- a/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java @@ -26,7 +26,6 @@ import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.search.suggest.analyzing.SuggestStopFilter; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java index 5ef4de1ea45f1..646e3d9b6ead4 100644 --- a/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java @@ -28,7 +28,6 @@ import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; import org.apache.lucene.analysis.synonym.WordnetSynonymParser; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.io.FastStringReader; diff --git a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java index 0a9972b357789..9e54e6f16eea9 100644 --- a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.miscellaneous.Lucene43TrimFilter; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TrimFilter; diff --git a/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java index 56d43acdfdb6a..8e4db15cd7de3 100644 --- a/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TruncateTokenFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java index 4f1513c9fb78f..b9c296df22b3f 100644 --- a/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase; import org.apache.lucene.analysis.util.CharArraySet; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -55,4 +54,4 @@ public AbstractCompoundWordTokenFilterFactory(Index index, @IndexSettings Settin throw new IllegalArgumentException("word_list must be provided for [" + name + "], either as a path to a file, or directly"); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java index 394e97b70258d..4224c9cc15d5f 100644 --- a/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.apache.lucene.util.Version; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.settings.Settings; @@ -75,4 +74,4 @@ public TokenStream create(TokenStream tokenStream) { minSubwordSize, maxSubwordSize, onlyLongestMatch); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java b/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java index 1a3af2b44c02e..13fc57ed1efd8 100644 --- a/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java +++ b/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java @@ -115,7 +115,7 @@ public void onClose(Object ownerCoreCacheKey) { } @Override - public void close() throws ElasticsearchException { + public void close() { indicesWarmer.removeListener(warmer); clear("close"); } diff --git a/src/main/java/org/elasticsearch/index/cache/filter/weighted/WeightedFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/weighted/WeightedFilterCache.java index 8ed25ec91a6cd..9e7a377286089 100644 --- a/src/main/java/org/elasticsearch/index/cache/filter/weighted/WeightedFilterCache.java +++ b/src/main/java/org/elasticsearch/index/cache/filter/weighted/WeightedFilterCache.java @@ -78,7 +78,7 @@ public String type() { } @Override - public void close() throws ElasticsearchException { + public void close() { clear("close"); } diff --git a/src/main/java/org/elasticsearch/index/codec/CodecService.java b/src/main/java/org/elasticsearch/index/codec/CodecService.java index 783f304346fed..bd1520526519c 100644 --- a/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -24,7 +24,6 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ImmutableSettings; @@ -86,7 +85,7 @@ public MapperService mapperService() { return mapperService; } - public Codec codec(String name) throws IllegalArgumentException { + public Codec codec(String name) { Codec codec = codecs.get(name); if (codec == null) { throw new IllegalArgumentException("failed to find codec [" + name + "]"); diff --git a/src/main/java/org/elasticsearch/index/engine/Engine.java b/src/main/java/org/elasticsearch/index/engine/Engine.java index 3409138a4d852..612b5cf7a7004 100644 --- a/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -28,7 +28,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Accountables; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Preconditions; @@ -540,11 +539,11 @@ public static interface FailedEngineListener { */ public static interface RecoveryHandler { - void phase1(SnapshotIndexCommit snapshot) throws ElasticsearchException; + void phase1(SnapshotIndexCommit snapshot); - void phase2(Translog.Snapshot snapshot) throws ElasticsearchException; + void phase2(Translog.Snapshot snapshot); - void phase3(Translog.Snapshot snapshot) throws ElasticsearchException; + void phase3(Translog.Snapshot snapshot); } public static class Searcher implements Releasable { @@ -573,7 +572,7 @@ public IndexSearcher searcher() { } @Override - public void close() throws ElasticsearchException { + public void close() { // Nothing to close here } } @@ -1045,7 +1044,7 @@ public void release() { protected abstract SearcherManager getSearcherManager(); - protected abstract void closeNoLock(String reason) throws ElasticsearchException; + protected abstract void closeNoLock(String reason); public void flushAndClose() throws IOException { if (isClosed.get() == false) { diff --git a/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java b/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java index d43a8268de30c..3384f78433f88 100644 --- a/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java +++ b/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.SearcherManager; import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.index.store.Store; @@ -47,7 +46,7 @@ public EngineSearcher(String source, IndexSearcher searcher, SearcherManager man } @Override - public void close() throws ElasticsearchException { + public void close() { if (!released.compareAndSet(false, true)) { /* In general, searchers should never be released twice or this would break reference counting. There is one rare case * when it might happen though: when the request and the Reaper thread would both try to release it in a very short amount diff --git a/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java b/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java index 3534ef9268ea9..223fa306697e9 100644 --- a/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java +++ b/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java @@ -40,7 +40,7 @@ public final class FlushingRecoveryCounter extends RecoveryCounter { } @Override - int endRecovery() throws ElasticsearchException { + int endRecovery() { int left = super.endRecovery(); if (left == 0) { try { diff --git a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 06be412060e94..7ea6db7692666 100644 --- a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -946,7 +946,7 @@ public List segments(boolean verbose) { * is failed. */ @Override - protected final void closeNoLock(String reason) throws ElasticsearchException { + protected final void closeNoLock(String reason) { if (isClosed.compareAndSet(false, true)) { assert rwl.isWriteLockedByCurrentThread() || failEngineLock.isHeldByCurrentThread() : "Either the write lock must be held or the engine must be currently be failing itself"; try { diff --git a/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java b/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java index cee6dd5b8a0e0..28401496456b1 100644 --- a/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java +++ b/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java @@ -52,7 +52,7 @@ public int get() { * End the recovery counter by decrementing the store's ref and the ongoing recovery counter * @return number of ongoing recoveries remaining */ - int endRecovery() throws ElasticsearchException { + int endRecovery() { store.decRef(); int left = onGoingRecoveries.decrementAndGet(); assert onGoingRecoveries.get() >= 0 : "ongoingRecoveries must be >= 0 but was: " + onGoingRecoveries.get(); @@ -60,7 +60,7 @@ int endRecovery() throws ElasticsearchException { } @Override - public void close() throws ElasticsearchException { + public void close() { endRecovery(); } } diff --git a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java index 30db42f502ecc..bd75cc289d296 100644 --- a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java +++ b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java @@ -214,7 +214,7 @@ protected SearcherManager getSearcherManager() { } @Override - protected void closeNoLock(String reason) throws ElasticsearchException { + protected void closeNoLock(String reason) { if (isClosed.compareAndSet(false, true)) { try { logger.debug("shadow replica close searcher manager refCount: {}", store.refCount()); diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java index 63885c4c539cd..19f3be065e897 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java +++ b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.collect.Tuple; diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java index fb0a1ab438587..44d90d9dd1325 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java @@ -24,7 +24,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder; import org.elasticsearch.index.mapper.core.BooleanFieldMapper; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java index 1c955efef3522..1759067f780dc 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java @@ -22,7 +22,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; import org.apache.lucene.util.CharsRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java index 80f03b90fe7f1..c82ac69f28250 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; -import java.lang.IllegalStateException; import org.elasticsearch.index.fielddata.AtomicFieldData; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.ScriptDocValues; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java index 40bc77aaefb95..4404ae461df22 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java @@ -29,8 +29,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.util.ByteUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.AtomicNumericFieldData; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java index 6cc9adbfdf2cf..1010bdffa0b4a 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java @@ -21,8 +21,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java index 4690a3529b698..425f85e81fa79 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.fielddata.plain; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalStateException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.*; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java index a211787039d6c..ba458df687987 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableSet; import org.apache.lucene.index.IndexReader; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java index 62a70b101d0dd..97b2ea1bae0d6 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java @@ -21,8 +21,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java index 5c400fb0d7329..710ddba04a409 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; -import java.lang.IllegalStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java index 7a4201d45cf32..6b4fea41894b7 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java @@ -39,7 +39,6 @@ import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.collect.ImmutableOpenMap; @@ -427,7 +426,7 @@ public Collection getChildResources() { } @Override - public void close() throws ElasticsearchException { + public void close() { List closeables = new ArrayList<>(); for (OrdinalMapAndAtomicFieldData fds : atomicFD.values()) { closeables.addAll(Arrays.asList(fds.fieldData)); diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java index 07ec2b7740398..18995573ee4e5 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.fielddata.AtomicNumericFieldData; import org.elasticsearch.index.fielddata.FieldData; diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java index e7aeb9d9c0fc3..0bcb8251b98c7 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.RandomAccessOrds; import org.apache.lucene.util.Accountable; -import java.lang.IllegalStateException; import org.elasticsearch.index.fielddata.AtomicFieldData; import org.elasticsearch.index.fielddata.FieldData; diff --git a/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/src/main/java/org/elasticsearch/index/get/ShardGetService.java index 23da1c3568278..eb8da964983e9 100644 --- a/src/main/java/org/elasticsearch/index/get/ShardGetService.java +++ b/src/main/java/org/elasticsearch/index/get/ShardGetService.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.Term; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; @@ -99,7 +98,7 @@ public ShardGetService setIndexShard(IndexShard indexShard) { } public GetResult get(String type, String id, String[] gFields, boolean realtime, long version, VersionType versionType, FetchSourceContext fetchSourceContext, boolean ignoreErrorsOnGeneratedFields) - throws ElasticsearchException { + { currentMetric.inc(); try { long now = System.nanoTime(); @@ -167,7 +166,7 @@ protected FetchSourceContext normalizeFetchSourceContent(@Nullable FetchSourceCo return FetchSourceContext.DO_NOT_FETCH_SOURCE; } - public GetResult innerGet(String type, String id, String[] gFields, boolean realtime, long version, VersionType versionType, FetchSourceContext fetchSourceContext, boolean ignoreErrorsOnGeneratedFields) throws ElasticsearchException { + public GetResult innerGet(String type, String id, String[] gFields, boolean realtime, long version, VersionType versionType, FetchSourceContext fetchSourceContext, boolean ignoreErrorsOnGeneratedFields) { fetchSourceContext = normalizeFetchSourceContent(fetchSourceContext, gFields); boolean loadSource = (gFields != null && gFields.length > 0) || fetchSourceContext.fetchSource(); diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java index 5c9cea416ec2c..e38f97f823356 100644 --- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.BitDocIdSet; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Preconditions; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java index b820aad9820e7..58f6bb271d76d 100755 --- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -39,7 +39,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.Tuple; diff --git a/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/src/main/java/org/elasticsearch/index/mapper/ParseContext.java index 3ddb3276b2419..b608cf8a55173 100644 --- a/src/main/java/org/elasticsearch/index/mapper/ParseContext.java +++ b/src/main/java/org/elasticsearch/index/mapper/ParseContext.java @@ -27,8 +27,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.lucene.all.AllEntries; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java index ae914de0597fa..7df9d2f179fae 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java index 64b9bbde98586..fc91a8ac06108 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java @@ -30,7 +30,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java index 0d6e4f4bee3e0..83b8781af9e63 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java @@ -28,8 +28,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.search.suggest.analyzing.XAnalyzingSuggester; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java index 75c1e8ac483d7..38309d729c64f 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java @@ -31,7 +31,6 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.ToStringUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java index 490455431e8d3..d380265007406 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java @@ -34,7 +34,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java index d1259d245984b..ad5faa81c4efc 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java @@ -34,7 +34,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java index 05015e2579364..647e7c3b5d188 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java @@ -31,7 +31,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java index afaefb4a31e55..a600769749aa9 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java @@ -31,7 +31,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java index edb3a12291a7a..d042e1ea661a0 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java @@ -39,7 +39,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java index 9947890619550..b0d15fac59d23 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java @@ -31,7 +31,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java index 3d9d871f3a82a..d5c4812b17d6d 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Filter; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java index 634b3c5d94367..6b7b10f69c611 100644 --- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java @@ -28,8 +28,6 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java index b34d4fea36d68..5a32182e1b38a 100644 --- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java @@ -29,7 +29,6 @@ import org.apache.lucene.spatial.prefix.tree.PackedQuadPrefixTree; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.geo.GeoUtils; diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java index 565f1dcc00b52..04e715f99428e 100644 --- a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java index 1abf2d38c6667..988152f4726b4 100644 --- a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java @@ -31,7 +31,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Numbers; @@ -83,7 +82,7 @@ public static String longToIp(long longIp) { private static final Pattern pattern = Pattern.compile("\\."); - public static long ipToLong(String ip) throws IllegalArgumentException { + public static long ipToLong(String ip) { try { if (!InetAddresses.isInetAddress(ip)) { throw new IllegalArgumentException("failed to parse ip [" + ip + "], not a valid ip address"); @@ -94,7 +93,7 @@ public static long ipToLong(String ip) throws IllegalArgumentException { } return (Long.parseLong(octets[0]) << 24) + (Integer.parseInt(octets[1]) << 16) + (Integer.parseInt(octets[2]) << 8) + Integer.parseInt(octets[3]); - } catch (Exception e) { + } catch (Exception e) if (e instanceof IllegalArgumentException) { throw (IllegalArgumentException) e; } diff --git a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java index 2edd773a81c42..d8a14abbacc7e 100644 --- a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java +++ b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper.object; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.index.mapper.ContentPath; diff --git a/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java index 6ea8d71c4f203..d304d24cdbeef 100644 --- a/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java @@ -20,7 +20,6 @@ import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.TieredMergePolicy; -import java.lang.IllegalArgumentException; import org.elasticsearch.index.shard.AbstractIndexShardComponent; import org.elasticsearch.index.store.Store; diff --git a/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java index 26b3ec39b913d..4dc5b14b883e7 100644 --- a/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java @@ -71,7 +71,7 @@ public LogByteSizeMergePolicy getMergePolicy() { } @Override - public void close() throws ElasticsearchException { + public void close() { indexSettingsService.removeListener(applySettings); } diff --git a/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java index b594908620677..03105b1ccda26 100644 --- a/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java @@ -64,7 +64,7 @@ public LogDocMergePolicyProvider(Store store, IndexSettingsService indexSettings } @Override - public void close() throws ElasticsearchException { + public void close() { indexSettingsService.removeListener(applySettings); } diff --git a/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java b/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java index ef25078287465..6b5241e98eb7f 100644 --- a/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java @@ -91,7 +91,7 @@ public TieredMergePolicy getMergePolicy() { } @Override - public void close() throws ElasticsearchException { + public void close() { indexSettingsService.removeListener(applySettings); } diff --git a/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java index ccd2b3aa723ea..69264fb4b45a5 100644 --- a/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/BaseFilterBuilder.java @@ -45,12 +45,12 @@ public String toString() { } @Override - public BytesReference buildAsBytes() throws ElasticsearchException { + public BytesReference buildAsBytes() { return buildAsBytes(XContentType.JSON); } @Override - public BytesReference buildAsBytes(XContentType contentType) throws ElasticsearchException { + public BytesReference buildAsBytes(XContentType contentType) { try { XContentBuilder builder = XContentFactory.contentBuilder(contentType); toXContent(builder, EMPTY_PARAMS); diff --git a/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java index 6cb131507407f..daa61f9d6e54d 100644 --- a/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/BaseQueryBuilder.java @@ -45,12 +45,12 @@ public String toString() { } @Override - public BytesReference buildAsBytes() throws ElasticsearchException { + public BytesReference buildAsBytes() { return buildAsBytes(XContentType.JSON); } @Override - public BytesReference buildAsBytes(XContentType contentType) throws ElasticsearchException { + public BytesReference buildAsBytes(XContentType contentType) { try { XContentBuilder builder = XContentFactory.contentBuilder(contentType); toXContent(builder, EMPTY_PARAMS); diff --git a/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java index 57f444e4eabe6..fef3cd30734b7 100644 --- a/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java index 62b73012fb691..223717084e62a 100644 --- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java index eb2038e8a55bc..683b8dfd9ba49 100644 --- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java @@ -28,7 +28,6 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.FieldMapper; diff --git a/src/main/java/org/elasticsearch/index/query/FilterBuilder.java b/src/main/java/org/elasticsearch/index/query/FilterBuilder.java index 50d0b3673fb36..9b3a89976c50c 100644 --- a/src/main/java/org/elasticsearch/index/query/FilterBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/FilterBuilder.java @@ -29,8 +29,8 @@ */ public interface FilterBuilder extends ToXContent { - BytesReference buildAsBytes() throws ElasticsearchException; + BytesReference buildAsBytes(); - BytesReference buildAsBytes(XContentType contentType) throws ElasticsearchException; + BytesReference buildAsBytes(XContentType contentType); } diff --git a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java index 3083056cc420f..5efedc86c1e17 100644 --- a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java index b26eaee2848a6..eeed9d270f04b 100644 --- a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java @@ -28,7 +28,6 @@ import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; import org.apache.lucene.spatial.query.SpatialArgs; import org.apache.lucene.spatial.query.SpatialOperation; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.geo.ShapeRelation; diff --git a/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java b/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java index 18d6ffead1c7e..f93cc2681b864 100644 --- a/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java +++ b/src/main/java/org/elasticsearch/index/query/GeohashCellFilter.java @@ -21,7 +21,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.QueryCachingPolicy; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java index 348e9cacba1f3..93c94ee98da95 100644 --- a/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java +++ b/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java @@ -201,7 +201,7 @@ public FilterParser filterParser(String name) { return filterParsers.get(name); } - public ParsedQuery parse(QueryBuilder queryBuilder) throws ElasticsearchException { + public ParsedQuery parse(QueryBuilder queryBuilder) { XContentParser parser = null; try { BytesReference bytes = queryBuilder.buildAsBytes(); @@ -218,11 +218,11 @@ public ParsedQuery parse(QueryBuilder queryBuilder) throws ElasticsearchExceptio } } - public ParsedQuery parse(byte[] source) throws ElasticsearchException { + public ParsedQuery parse(byte[] source) { return parse(source, 0, source.length); } - public ParsedQuery parse(byte[] source, int offset, int length) throws ElasticsearchException { + public ParsedQuery parse(byte[] source, int offset, int length) { XContentParser parser = null; try { parser = XContentFactory.xContent(source, offset, length).createParser(source, offset, length); @@ -238,11 +238,11 @@ public ParsedQuery parse(byte[] source, int offset, int length) throws Elasticse } } - public ParsedQuery parse(BytesReference source) throws ElasticsearchException { + public ParsedQuery parse(BytesReference source) { return parse(cache.get(), source); } - public ParsedQuery parse(QueryParseContext context, BytesReference source) throws ElasticsearchException { + public ParsedQuery parse(QueryParseContext context, BytesReference source) { XContentParser parser = null; try { parser = XContentFactory.xContent(source).createParser(source); diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java index 9c964d0bce52f..a19376acfcf72 100644 --- a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.get.MultiGetRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java index 9325d0f72f81d..0050b7199a130 100644 --- a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java +++ b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java @@ -28,7 +28,6 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest; @@ -354,4 +353,4 @@ private void handleExclude(BooleanQuery boolQuery, MultiTermVectorsRequest likeI boolQuery.add(query, BooleanClause.Occur.MUST_NOT); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/src/main/java/org/elasticsearch/index/query/QueryBuilder.java index c4d3588edceda..87025de9bb670 100644 --- a/src/main/java/org/elasticsearch/index/query/QueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/QueryBuilder.java @@ -29,7 +29,7 @@ */ public interface QueryBuilder extends ToXContent { - BytesReference buildAsBytes() throws ElasticsearchException; + BytesReference buildAsBytes(); - BytesReference buildAsBytes(XContentType contentType) throws ElasticsearchException; + BytesReference buildAsBytes(XContentType contentType); } diff --git a/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/src/main/java/org/elasticsearch/index/query/RegexpFlag.java index 68c024b032a64..d2a3eafea561f 100644 --- a/src/main/java/org/elasticsearch/index/query/RegexpFlag.java +++ b/src/main/java/org/elasticsearch/index/query/RegexpFlag.java @@ -21,7 +21,6 @@ import java.util.Locale; import org.apache.lucene.util.automaton.RegExp; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; /** diff --git a/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java b/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java index e821fab8e0a0b..a619b3d63ba94 100644 --- a/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java +++ b/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.QueryCachingPolicy; import org.apache.lucene.util.Bits; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.lucene.HashedBytesRef; @@ -206,4 +205,4 @@ public long ramBytesUsed() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java index 7fe973ab8c263..ce0ce88a9e43f 100644 --- a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java +++ b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import java.util.Locale; @@ -77,4 +76,4 @@ static int resolveFlags(String flags) { } return magic; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java index f99253f1bb6fe..2e89d2ff93f0c 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java index bd69ac6dca14c..2bcbab5487b71 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java index 150a3ab6f607d..b453809e837fc 100644 --- a/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java index ce133743fb7c6..ca35a42ae3b1d 100644 --- a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.script.ScriptService; diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java index 8c3e8cc8fc9e0..96aabb2cc444c 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query.functionscore; -import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.MultiValueMode; @@ -89,4 +88,4 @@ public ScoreFunctionBuilder setMultiValueMode(String multiValueMode) { this.multiValueMode = MultiValueMode.fromString(multiValueMode.toUpperCase(Locale.ROOT)); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java index 0c9a779fc7d63..6268f4a5c7404 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java @@ -21,7 +21,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Explanation; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.GeoDistance; diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java index 8c6897d75b123..f7856462bfaae 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query.functionscore; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.search.function.CombineFunction; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.BaseQueryBuilder; @@ -226,4 +225,4 @@ public FunctionScoreQueryBuilder setMinScore(float minScore) { this.minScore = minScore; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java index 352ea1127de2b..3a176c46877e6 100644 --- a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query.functionscore.factor; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.search.function.BoostScoreFunction; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder; @@ -65,4 +64,4 @@ public ScoreFunctionBuilder setWeight(float weight) { public void buildWeight(XContentBuilder builder) throws IOException { //we do not want the weight to be written for boost_factor as it does not make sense to have it } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java b/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java index cf8f629d6e727..149b47eadf9c3 100644 --- a/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java +++ b/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query.support; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java index 2a0efa8aadb70..7d882090b3703 100644 --- a/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java +++ b/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java @@ -21,7 +21,6 @@ import org.apache.lucene.search.MultiTermQuery; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; /** diff --git a/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/src/main/java/org/elasticsearch/index/search/MatchQuery.java index baecbf6f26559..784f4ce18e31e 100644 --- a/src/main/java/org/elasticsearch/index/search/MatchQuery.java +++ b/src/main/java/org/elasticsearch/index/search/MatchQuery.java @@ -25,8 +25,6 @@ import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.util.QueryBuilder; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; import org.elasticsearch.common.lucene.search.Queries; @@ -303,4 +301,4 @@ protected Query blendTermQuery(Term term, FieldMapper mapper) { return new TermQuery(term); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java index 2d315c214fcaa..f9a1e76034d75 100644 --- a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java +++ b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalStateException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.index.mapper.FieldMapper; @@ -269,4 +268,4 @@ public Term newTerm(String value) { protected boolean forceAnalyzeQueryString() { return this.queryBuilder == null ? super.forceAnalyzeQueryString() : this.queryBuilder.forceAnalyzeQueryString(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java index 960739cb3c3f8..e253e1a848dc5 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java @@ -378,7 +378,7 @@ public void setScorer(Scorer scorer) throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(parentIdxs); } } @@ -404,7 +404,7 @@ protected void newParent(long parentIdx) throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(parentIdxs, scores); } } @@ -427,7 +427,7 @@ protected void newParent(long parentIdx) throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(parentIdxs, scores, occurrences); } } @@ -453,7 +453,7 @@ protected void existingParent(long parentIdx) throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(parentIdxs, occurrences); } } diff --git a/src/main/java/org/elasticsearch/index/search/child/CustomQueryWrappingFilter.java b/src/main/java/org/elasticsearch/index/search/child/CustomQueryWrappingFilter.java index 2bdf5ff87b2cb..0adfff07e4374 100644 --- a/src/main/java/org/elasticsearch/index/search/child/CustomQueryWrappingFilter.java +++ b/src/main/java/org/elasticsearch/index/search/child/CustomQueryWrappingFilter.java @@ -93,7 +93,7 @@ public long ramBytesUsed() { } @Override - public void close() throws ElasticsearchException { + public void close() { // We need to clear the docIdSets, otherwise this is leaved unused // DocIdSets around and can potentially become a memory leak. docIdSets = null; diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java b/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java index a45d1e2a9126b..388f5e46a351b 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java @@ -209,7 +209,7 @@ protected void doSetNextReader(LeafReaderContext context) throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(parentIdxs, scores); } diff --git a/src/main/java/org/elasticsearch/index/search/child/ScoreType.java b/src/main/java/org/elasticsearch/index/search/child/ScoreType.java index 736744f7de2a7..b9ea6281157c2 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ScoreType.java +++ b/src/main/java/org/elasticsearch/index/search/child/ScoreType.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.search.child; -import java.lang.IllegalArgumentException; /** * Defines how scores from child documents are mapped into the parent document. diff --git a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java index 3c4d28b90d910..0529350863f91 100644 --- a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java @@ -25,7 +25,6 @@ import org.apache.lucene.search.*; import org.apache.lucene.util.*; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.search.EmptyScorer; import org.apache.lucene.search.join.BitDocIdSetFilter; @@ -317,7 +316,7 @@ public void normalize(float norm, float topLevelBoost) { } @Override - public void close() throws ElasticsearchException { + public void close() { } @Override diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java index ec1580ec7ab5c..f5cbe4f342369 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.DocValuesDocIdSet; import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java index 59cb14364a3ec..93e688427bbc9 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; import org.apache.lucene.util.NumericUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; diff --git a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java index f0b4cd64545d7..f8020f4b95b17 100644 --- a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java +++ b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java @@ -22,7 +22,6 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Filter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper; diff --git a/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java b/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java index feb4cea8f004c..dbe42131d1e57 100644 --- a/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java +++ b/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java @@ -19,8 +19,6 @@ package org.elasticsearch.index.search.shape; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.client.Client; diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 4768b4eef8b1f..4e00df55baada 100644 --- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -31,8 +31,6 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.ThreadInterruptedException; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; @@ -457,11 +455,11 @@ private IndexShardState changeState(IndexShardState newState, String reason) { return previousState; } - public Engine.Create prepareCreate(SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates, boolean autoGeneratedId) throws ElasticsearchException { + public Engine.Create prepareCreate(SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates, boolean autoGeneratedId) { return prepareCreate(docMapper(source.type()), source, version, versionType, origin, state != IndexShardState.STARTED || canHaveDuplicates, autoGeneratedId); } - static Engine.Create prepareCreate(Tuple docMapper, SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates, boolean autoGeneratedId) throws ElasticsearchException { + static Engine.Create prepareCreate(Tuple docMapper, SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates, boolean autoGeneratedId) { long startTime = System.nanoTime(); ParsedDocument doc = docMapper.v1().parse(source); if (docMapper.v2() != null) { @@ -470,7 +468,7 @@ static Engine.Create prepareCreate(Tuple docMapper, Sou return new Engine.Create(docMapper.v1(), docMapper.v1().uidMapper().term(doc.uid().stringValue()), doc, version, versionType, origin, startTime, canHaveDuplicates, autoGeneratedId); } - public void create(Engine.Create create) throws ElasticsearchException { + public void create(Engine.Create create) { writeAllowed(create.origin()); create = indexingService.preCreate(create); mapperAnalyzer.setType(create.type()); @@ -487,11 +485,11 @@ public void create(Engine.Create create) throws ElasticsearchException { indexingService.postCreate(create); } - public Engine.Index prepareIndex(SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates) throws ElasticsearchException { + public Engine.Index prepareIndex(SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates) { return prepareIndex(docMapper(source.type()), source, version, versionType, origin, state != IndexShardState.STARTED || canHaveDuplicates); } - static Engine.Index prepareIndex(Tuple docMapper, SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates) throws ElasticsearchException { + static Engine.Index prepareIndex(Tuple docMapper, SourceToParse source, long version, VersionType versionType, Engine.Operation.Origin origin, boolean canHaveDuplicates) { long startTime = System.nanoTime(); ParsedDocument doc = docMapper.v1().parse(source); if (docMapper.v2() != null) { @@ -504,7 +502,7 @@ static Engine.Index prepareIndex(Tuple docMapper, Sourc * Index a document and return whether it was created, as opposed to just * updated. */ - public boolean index(Engine.Index index) throws ElasticsearchException { + public boolean index(Engine.Index index) { writeAllowed(index.origin()); index = indexingService.preIndex(index); mapperAnalyzer.setType(index.type()); @@ -523,13 +521,13 @@ public boolean index(Engine.Index index) throws ElasticsearchException { return created; } - public Engine.Delete prepareDelete(String type, String id, long version, VersionType versionType, Engine.Operation.Origin origin) throws ElasticsearchException { + public Engine.Delete prepareDelete(String type, String id, long version, VersionType versionType, Engine.Operation.Origin origin) { long startTime = System.nanoTime(); final DocumentMapper documentMapper = docMapper(type).v1(); return new Engine.Delete(type, id, documentMapper.uidMapper().term(type, id), version, versionType, origin, startTime, false); } - public void delete(Engine.Delete delete) throws ElasticsearchException { + public void delete(Engine.Delete delete) { writeAllowed(delete.origin()); delete = indexingService.preDelete(delete); try { @@ -545,11 +543,11 @@ public void delete(Engine.Delete delete) throws ElasticsearchException { indexingService.postDelete(delete); } - public Engine.DeleteByQuery prepareDeleteByQuery(BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) throws ElasticsearchException { + public Engine.DeleteByQuery prepareDeleteByQuery(BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) { return prepareDeleteByQuery(queryParserService, mapperService, indexAliasesService, indexCache, source, filteringAliases, origin, types); } - static Engine.DeleteByQuery prepareDeleteByQuery(IndexQueryParserService queryParserService, MapperService mapperService, IndexAliasesService indexAliasesService, IndexCache indexCache, BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) throws ElasticsearchException { + static Engine.DeleteByQuery prepareDeleteByQuery(IndexQueryParserService queryParserService, MapperService mapperService, IndexAliasesService indexAliasesService, IndexCache indexCache, BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) { long startTime = System.nanoTime(); if (types == null) { types = Strings.EMPTY_ARRAY; @@ -565,12 +563,12 @@ static Engine.DeleteByQuery prepareDeleteByQuery(IndexQueryParserService queryPa return new Engine.DeleteByQuery(query, source, filteringAliases, aliasFilter, parentFilter, origin, startTime, types); } - public Engine.GetResult get(Engine.Get get) throws ElasticsearchException { + public Engine.GetResult get(Engine.Get get) { readAllowed(); return engine().get(get); } - public void refresh(String source) throws ElasticsearchException { + public void refresh(String source) { verifyNotClosed(); if (logger.isTraceEnabled()) { logger.trace("refresh with source: {}", source); @@ -686,7 +684,7 @@ public CompletionStats completionStats(String... fields) { return completionStats; } - public void flush(FlushRequest request) throws ElasticsearchException { + public void flush(FlushRequest request) { // we allows flush while recovering, since we allow for operations to happen // while recovering, and we want to keep the translog at bay (up to deletes, which // we don't gc). @@ -699,7 +697,7 @@ public void flush(FlushRequest request) throws ElasticsearchException { flushMetric.inc(System.nanoTime() - time); } - public void optimize(OptimizeRequest optimize) throws ElasticsearchException { + public void optimize(OptimizeRequest optimize) { verifyStarted(); if (logger.isTraceEnabled()) { logger.trace("optimize with {}", optimize); @@ -780,7 +778,7 @@ public IndexShard postRecovery(String reason) throws IndexShardStartedException, } /** called before starting to copy index files over */ - public void prepareForIndexRecovery() throws ElasticsearchException { + public void prepareForIndexRecovery() { if (state != IndexShardState.RECOVERING) { throw new IndexShardNotRecoveringException(shardId, state); } @@ -803,14 +801,14 @@ public int performBatchRecovery(Iterable operations) { /** * After the store has been recovered, we need to start the engine in order to apply operations */ - public Map performTranslogRecovery() throws ElasticsearchException { + public Map performTranslogRecovery() { final Map recoveredTypes = internalPerformTranslogRecovery(false); assert recoveryState.getStage() == RecoveryState.Stage.TRANSLOG : "TRANSLOG stage expected but was: " + recoveryState.getStage(); return recoveredTypes; } - private Map internalPerformTranslogRecovery(boolean skipTranslogRecovery) throws ElasticsearchException { + private Map internalPerformTranslogRecovery(boolean skipTranslogRecovery) { if (state != IndexShardState.RECOVERING) { throw new IndexShardNotRecoveringException(shardId, state); } @@ -833,7 +831,7 @@ private Map internalPerformTranslogRecovery(boolean skipTranslo * the replay of the transaction log which is required in cases where we restore a previous index or recover from * a remote peer. */ - public void skipTranslogRecovery() throws ElasticsearchException { + public void skipTranslogRecovery() { assert engineUnsafe() == null : "engine was already created"; Map recoveredTypes = internalPerformTranslogRecovery(true); assert recoveredTypes.isEmpty(); diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/src/main/java/org/elasticsearch/index/shard/IndexShardState.java index a97cc450f97e2..fa4122cabba1a 100644 --- a/src/main/java/org/elasticsearch/index/shard/IndexShardState.java +++ b/src/main/java/org/elasticsearch/index/shard/IndexShardState.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.shard; -import java.lang.IllegalArgumentException; /** * @@ -51,7 +50,7 @@ public byte id() { return this.id; } - public static IndexShardState fromId(byte id) throws IllegalArgumentException { + public static IndexShardState fromId(byte id) { if (id < 0 || id >= IDS.length) { throw new IllegalArgumentException("No mapping for id [" + id + "]"); } diff --git a/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java b/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java index 64f250678acaf..ba7dcdd397662 100644 --- a/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java +++ b/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.shard; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/src/main/java/org/elasticsearch/index/shard/ShardPath.java index 102d565d679de..870283017c897 100644 --- a/src/main/java/org/elasticsearch/index/shard/ShardPath.java +++ b/src/main/java/org/elasticsearch/index/shard/ShardPath.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.shard; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.logging.ESLogger; diff --git a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java index 7d63b2cdd177f..b2dbc1022cfa8 100644 --- a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java +++ b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.shard; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.index.aliases.IndexAliasesService; import org.elasticsearch.index.cache.IndexCache; @@ -89,7 +88,7 @@ private void addMappingUpdate(String type, Mapping update) { * Performs a single recovery operation, and returns the indexing operation (or null if its not an indexing operation) * that can then be used for mapping updates (for example) if needed. */ - public void performRecoveryOperation(Engine engine, Translog.Operation operation) throws ElasticsearchException { + public void performRecoveryOperation(Engine engine, Translog.Operation operation) { try { switch (operation.opType()) { case CREATE: diff --git a/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java index 48c5dc6f52149..566016b3da12a 100644 --- a/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.similarity; import org.apache.lucene.search.similarities.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; /** diff --git a/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java index 9c81bf0415ac5..6d30e81c09158 100644 --- a/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.search.similarities.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; diff --git a/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java b/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java index 68eaccc741b58..4741247080ca3 100644 --- a/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java +++ b/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.search.similarities.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.assistedinject.Assisted; diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java index 4a1c4578cdb32..e2bc92adb3f56 100644 --- a/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java +++ b/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.similarity; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.Scopes; import org.elasticsearch.common.inject.assistedinject.FactoryProvider; diff --git a/src/main/java/org/elasticsearch/index/store/IndexStore.java b/src/main/java/org/elasticsearch/index/store/IndexStore.java index 0cae510f87b8f..cfef4f594befa 100644 --- a/src/main/java/org/elasticsearch/index/store/IndexStore.java +++ b/src/main/java/org/elasticsearch/index/store/IndexStore.java @@ -99,7 +99,7 @@ public IndexStore(Index index, @IndexSettings Settings indexSettings, IndexSetti } @Override - public void close() throws ElasticsearchException { + public void close() { settingsService.removeListener(applySettings); } diff --git a/src/main/java/org/elasticsearch/index/store/Store.java b/src/main/java/org/elasticsearch/index/store/Store.java index 166bd7d96c35e..71dd77c690e8e 100644 --- a/src/main/java/org/elasticsearch/index/store/Store.java +++ b/src/main/java/org/elasticsearch/index/store/Store.java @@ -27,7 +27,6 @@ import org.apache.lucene.store.*; import org.apache.lucene.util.*; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; diff --git a/src/main/java/org/elasticsearch/index/translog/Translog.java b/src/main/java/org/elasticsearch/index/translog/Translog.java index bcf707c795b9f..63970ab3aafd1 100644 --- a/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -23,8 +23,6 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; diff --git a/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java b/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java index be2bd5de4b009..bff79bb5dbfc6 100644 --- a/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java +++ b/src/main/java/org/elasticsearch/index/translog/fs/FsChannelSnapshot.java @@ -145,7 +145,7 @@ public void seekTo(long position) { } @Override - public void close() throws ElasticsearchException { + public void close() { if (closed.compareAndSet(false, true)) { channelReference.decRef(); } diff --git a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java index 58ce5ab5807e5..15b76333b7a9c 100644 --- a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java +++ b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java @@ -536,7 +536,7 @@ public Translog.Operation next() throws IOException { } @Override - public void close() throws ElasticsearchException { + public void close() { try { input.close(); } catch (IOException ex) { diff --git a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java index 775c5cd7c4768..751bfc3ec5b28 100644 --- a/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java +++ b/src/main/java/org/elasticsearch/index/translog/fs/FsTranslogFile.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.translog.fs; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.translog.Translog; @@ -49,7 +48,7 @@ public FsTranslogFile create(ShardId shardId, long id, ChannelReference channelR public abstract FsTranslogFile create(ShardId shardId, long id, ChannelReference raf, int bufferSize) throws IOException; - public static Type fromString(String type) throws IllegalArgumentException { + public static Type fromString(String type) { if (SIMPLE.name().equalsIgnoreCase(type)) { return SIMPLE; } else if (BUFFERED.name().equalsIgnoreCase(type)) { diff --git a/src/main/java/org/elasticsearch/indices/IndicesService.java b/src/main/java/org/elasticsearch/indices/IndicesService.java index 579eca91b721c..663fe402729da 100644 --- a/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -25,8 +25,6 @@ import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.stats.CommonStats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag; @@ -124,11 +122,11 @@ public IndicesService(Settings settings, IndicesLifecycle indicesLifecycle, Indi } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { ImmutableSet indices = ImmutableSet.copyOf(this.indices.keySet()); final CountDownLatch latch = new CountDownLatch(indices.size()); @@ -160,7 +158,7 @@ public void run() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { IOUtils.closeWhileHandlingException(injector.getInstance(RecoverySettings.class), indicesAnalysisService); } @@ -280,7 +278,7 @@ public IndexService indexServiceSafe(String index) throws IndexMissingException return indexService; } - public synchronized IndexService createIndex(String sIndexName, @IndexSettings Settings settings, String localNodeId) throws ElasticsearchException { + public synchronized IndexService createIndex(String sIndexName, @IndexSettings Settings settings, String localNodeId) { if (!lifecycle.started()) { throw new IllegalStateException("Can't create an index [" + sIndexName + "], node is closed"); } @@ -342,11 +340,11 @@ public synchronized IndexService createIndex(String sIndexName, @IndexSettings S * @param index the index to remove * @param reason the high level reason causing this removal */ - public void removeIndex(String index, String reason) throws ElasticsearchException { + public void removeIndex(String index, String reason) { removeIndex(index, reason, false); } - private void removeIndex(String index, String reason, boolean delete) throws ElasticsearchException { + private void removeIndex(String index, String reason, boolean delete) { try { final IndexService indexService; final Injector indexInjector; @@ -751,4 +749,4 @@ int numPendingDeletes(Index index) { return deleteList.size(); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java b/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java index aaa81a68becf0..cf9db03463dce 100644 --- a/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java +++ b/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java @@ -57,14 +57,14 @@ protected CircuitBreakerService(Settings settings) { public abstract CircuitBreakerStats stats(String name); @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } } diff --git a/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java index 34e1feec60725..73877a2f6315d 100644 --- a/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java +++ b/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.breaker; -import java.lang.IllegalStateException; import org.elasticsearch.common.breaker.ChildMemoryCircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreakingException; diff --git a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java index c0b9458f9526c..7447eea4d8958 100644 --- a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java +++ b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java @@ -26,7 +26,6 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import org.apache.lucene.search.DocIdSet; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -228,4 +227,4 @@ private void schedule() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java b/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java index d8a2b101fcc46..1f7486de4acf9 100644 --- a/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java +++ b/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java @@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index 7a068641c511f..ca3b7e73744e8 100644 --- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -25,7 +25,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterService; @@ -133,17 +132,17 @@ public IndicesClusterStateService(Settings settings, IndicesService indicesServi } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { clusterService.addFirst(this); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { clusterService.remove(this); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override @@ -509,7 +508,7 @@ private void processAliases(String index, ObjectContainer aliases indexAliasesService.addAll(newAliases); } - private void applyNewOrUpdatedShards(final ClusterChangedEvent event) throws ElasticsearchException { + private void applyNewOrUpdatedShards(final ClusterChangedEvent event) { if (!indicesService.changesAllowed()) { return; } @@ -637,7 +636,7 @@ private void cleanFailedShards(final ClusterChangedEvent event) { } } - private void applyInitializingShard(final ClusterState state, final IndexMetaData indexMetaData, final ShardRouting shardRouting) throws ElasticsearchException { + private void applyInitializingShard(final ClusterState state, final IndexMetaData indexMetaData, final ShardRouting shardRouting) { final IndexService indexService = indicesService.indexService(shardRouting.index()); if (indexService == null) { // got deleted on us, ignore diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java index 3c5ef7d63c413..747edb0ad0721 100644 --- a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java +++ b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.SegmentReader; import org.apache.lucene.util.Accountable; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; diff --git a/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java b/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java index 14b9490173613..c2f282eb396ef 100644 --- a/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java +++ b/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java @@ -125,19 +125,19 @@ public IndexingMemoryController(Settings settings, ThreadPool threadPool, Indice } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { // its fine to run it on the scheduler thread, no busy work this.scheduler = threadPool.scheduleWithFixedDelay(new ShardsIndicesStatusChecker(), interval); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { FutureUtils.cancel(scheduler); scheduler = null; } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } /** diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 50fd53a0f9882..6a429974f6907 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -146,7 +146,7 @@ public RecoveryResponse getResponse() { * and releasing the snapshot once all 3 phases of recovery are complete */ @Override - public void phase1(final SnapshotIndexCommit snapshot) throws ElasticsearchException { + public void phase1(final SnapshotIndexCommit snapshot) { cancellableThreads.checkForCancel(); // Total size of segment files that are recovered long totalSize = 0; @@ -428,7 +428,7 @@ public int compare(StoreFileMetaData o1, StoreFileMetaData o2) { * of the translog and releasing it once all 3 phases of recovery are complete */ @Override - public void phase2(Translog.Snapshot snapshot) throws ElasticsearchException { + public void phase2(Translog.Snapshot snapshot) { if (shard.state() == IndexShardState.CLOSED) { throw new IndexShardClosedException(request.shardId()); } @@ -479,7 +479,7 @@ public void run() throws InterruptedException { * three phases are released. */ @Override - public void phase3(Translog.Snapshot snapshot) throws ElasticsearchException { + public void phase3(Translog.Snapshot snapshot) { if (shard.state() == IndexShardState.CLOSED) { throw new IndexShardClosedException(request.shardId()); } diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java index c465aeae70e06..c2af0657bc54a 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java +++ b/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java @@ -20,8 +20,6 @@ package org.elasticsearch.indices.recovery; import com.google.common.collect.ImmutableList; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.RestoreSource; import org.elasticsearch.common.Nullable; @@ -82,7 +80,7 @@ public byte id() { return id; } - public static Stage fromId(byte id) throws IllegalArgumentException { + public static Stage fromId(byte id) { if (id < 0 || id >= STAGES.length) { throw new IllegalArgumentException("No mapping for id [" + id + "]"); } @@ -115,7 +113,7 @@ public byte id() { return id; } - public static Type fromId(byte id) throws IllegalArgumentException { + public static Type fromId(byte id) { if (id < 0 || id >= TYPES.length) { throw new IllegalArgumentException("No mapping for id [" + id + "]"); } diff --git a/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java b/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java index 0fc7c209111f2..bacd084d0585d 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java +++ b/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java @@ -20,7 +20,6 @@ package org.elasticsearch.indices.recovery; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.action.index.MappingUpdatedAction; import org.elasticsearch.common.logging.ESLogger; @@ -46,7 +45,7 @@ public SharedFSRecoverySourceHandler(IndexShard shard, StartRecoveryRequest requ } @Override - public void phase1(SnapshotIndexCommit snapshot) throws ElasticsearchException { + public void phase1(SnapshotIndexCommit snapshot) { if (request.recoveryType() == RecoveryState.Type.RELOCATION && shard.routingEntry().primary()) { // here we simply fail the primary shard since we can't move them (have 2 writers open at the same time) // by failing the shard we play safe and just go through the entire reallocation procedure of the primary @@ -60,7 +59,7 @@ public void phase1(SnapshotIndexCommit snapshot) throws ElasticsearchException { @Override - protected int sendSnapshot(Translog.Snapshot snapshot) throws ElasticsearchException { + protected int sendSnapshot(Translog.Snapshot snapshot) { logger.trace("{} recovery [phase3] to {}: skipping transaction log operations for file sync", shard.shardId(), request.targetNode()); return 0; } diff --git a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java index ab1ba9232aafe..f95cfd8ece9f0 100644 --- a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java +++ b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java @@ -110,7 +110,7 @@ protected NodesStoreFilesMetaData newResponse(Request request, AtomicReferenceAr } @Override - protected NodeStoreFilesMetaData nodeOperation(NodeRequest request) throws ElasticsearchException { + protected NodeStoreFilesMetaData nodeOperation(NodeRequest request) { if (request.unallocated) { IndexService indexService = indicesService.indexService(request.shardId.index().name()); if (indexService == null) { diff --git a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java index f70a74521b3f4..9adbeb882807f 100644 --- a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java +++ b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java @@ -91,12 +91,12 @@ public IndicesTTLService(Settings settings, ClusterService clusterService, Indic } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { this.purgerThread.start(); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { try { this.purgerThread.shutdown(); } catch (InterruptedException e) { @@ -105,7 +105,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } private class PurgerThread extends Thread { diff --git a/src/main/java/org/elasticsearch/monitor/MonitorService.java b/src/main/java/org/elasticsearch/monitor/MonitorService.java index 96d129b5dc937..df8926b908350 100644 --- a/src/main/java/org/elasticsearch/monitor/MonitorService.java +++ b/src/main/java/org/elasticsearch/monitor/MonitorService.java @@ -81,17 +81,17 @@ public FsService fsService() { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { jvmMonitorService.start(); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { jvmMonitorService.stop(); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { jvmMonitorService.close(); } } diff --git a/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java index 911d6a6445a16..861297f348288 100644 --- a/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java +++ b/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java @@ -20,7 +20,6 @@ package org.elasticsearch.monitor.jvm; import org.apache.lucene.util.CollectionUtil; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.unit.TimeValue; diff --git a/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java b/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java index 16bcd2077b501..64b0eeeefe35a 100644 --- a/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java +++ b/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java @@ -109,7 +109,7 @@ public JvmMonitorService(Settings settings, ThreadPool threadPool) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { if (!enabled) { return; } @@ -117,7 +117,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { if (!enabled) { return; } @@ -125,7 +125,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } private class JvmMonitor implements Runnable { diff --git a/src/main/java/org/elasticsearch/node/Node.java b/src/main/java/org/elasticsearch/node/Node.java index 603898dcbaeac..07aee270d9edc 100644 --- a/src/main/java/org/elasticsearch/node/Node.java +++ b/src/main/java/org/elasticsearch/node/Node.java @@ -21,7 +21,6 @@ import org.elasticsearch.Build; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionModule; import org.elasticsearch.cache.recycler.PageCacheRecycler; @@ -123,11 +122,11 @@ public class Node implements Releasable { private final PluginsService pluginsService; private final Client client; - public Node() throws ElasticsearchException { + public Node() { this(ImmutableSettings.Builder.EMPTY_SETTINGS, true); } - public Node(Settings preparedSettings, boolean loadConfigSettings) throws ElasticsearchException { + public Node(Settings preparedSettings, boolean loadConfigSettings) { final Settings pSettings = settingsBuilder().put(preparedSettings) .put(Client.CLIENT_TYPE_SETTING, CLIENT_TYPE).build(); Tuple tuple = InternalSettingsPreparer.prepareSettings(pSettings, loadConfigSettings); diff --git a/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java b/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java index 618703af3aa07..2f3063a484ff7 100644 --- a/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java +++ b/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java @@ -107,7 +107,7 @@ private DocSearcher(IndexSearcher searcher, MemoryIndex rootDocMemoryIndex) { } @Override - public void close() throws ElasticsearchException { + public void close() { try { this.reader().close(); rootDocMemoryIndex.reset(); diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorService.java b/src/main/java/org/elasticsearch/percolator/PercolatorService.java index 958b1a55963da..4c79c2164d8c1 100644 --- a/src/main/java/org/elasticsearch/percolator/PercolatorService.java +++ b/src/main/java/org/elasticsearch/percolator/PercolatorService.java @@ -36,7 +36,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CloseableThreadLocal; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.action.percolate.PercolateShardRequest; @@ -247,7 +246,7 @@ public PercolateShardResponse percolate(PercolateShardRequest request) { } } - private ParsedDocument parseRequest(IndexService documentIndexService, PercolateShardRequest request, PercolateContext context) throws ElasticsearchException { + private ParsedDocument parseRequest(IndexService documentIndexService, PercolateShardRequest request, PercolateContext context) { BytesReference source = request.source(); if (source == null || source.length() == 0) { return null; diff --git a/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java b/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java index 7df3d66e948b7..165193d35f036 100644 --- a/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java +++ b/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java @@ -77,7 +77,7 @@ public DocEngineSearcher(MemoryIndex memoryIndex) { } @Override - public void close() throws ElasticsearchException { + public void close() { try { this.reader().close(); memoryIndex.reset(); diff --git a/src/main/java/org/elasticsearch/plugins/PluginsService.java b/src/main/java/org/elasticsearch/plugins/PluginsService.java index a260a997ceddf..3d4b9f86e8a61 100644 --- a/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -25,7 +25,6 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.info.PluginInfo; import org.elasticsearch.action.admin.cluster.node.info.PluginsInfo; diff --git a/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/src/main/java/org/elasticsearch/repositories/RepositoriesService.java index 08454424ab0e4..e88ff922d728e 100644 --- a/src/main/java/org/elasticsearch/repositories/RepositoriesService.java +++ b/src/main/java/org/elasticsearch/repositories/RepositoriesService.java @@ -22,7 +22,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.ack.ClusterStateUpdateRequest; diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index d7018947ac351..180f659552170 100644 --- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -158,7 +158,7 @@ protected BlobStoreRepository(String repositoryName, RepositorySettings reposito * {@inheritDoc} */ @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { this.snapshotsBlobContainer = blobStore().blobContainer(basePath()); indexShardRepository.initialize(blobStore(), basePath(), chunkSize(), snapshotRateLimiter, restoreRateLimiter, this); @@ -168,14 +168,14 @@ protected void doStart() throws ElasticsearchException { * {@inheritDoc} */ @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } /** * {@inheritDoc} */ @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { try { blobStore().close(); } catch (Throwable t) { diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java index 9535fa7237ab4..bdbd45451fbbd 100644 --- a/src/main/java/org/elasticsearch/rest/RestController.java +++ b/src/main/java/org/elasticsearch/rest/RestController.java @@ -21,8 +21,6 @@ import com.google.common.collect.ImmutableSet; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; @@ -63,15 +61,15 @@ public RestController(Settings settings) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { for (RestFilter filter : filters) { filter.close(); } diff --git a/src/main/java/org/elasticsearch/rest/RestFilter.java b/src/main/java/org/elasticsearch/rest/RestFilter.java index 398f157d7b56b..dd86c026b7506 100644 --- a/src/main/java/org/elasticsearch/rest/RestFilter.java +++ b/src/main/java/org/elasticsearch/rest/RestFilter.java @@ -37,7 +37,7 @@ public int order() { } @Override - public void close() throws ElasticsearchException { + public void close() { // a no op } diff --git a/src/main/java/org/elasticsearch/rest/RestRequest.java b/src/main/java/org/elasticsearch/rest/RestRequest.java index d54195068bef0..6f2fd926ab953 100644 --- a/src/main/java/org/elasticsearch/rest/RestRequest.java +++ b/src/main/java/org/elasticsearch/rest/RestRequest.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.ContextHolder; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java index 9c697afdfe138..2019b71426acf 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.alias; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.client.Client; diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java index 0e0e2736b0d3a..4965f6b218d42 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.rest.action.admin.indices.alias.put; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java index 77fd1b89fd36e..4a5e47b9664e8 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.admin.indices.analyze; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.client.Client; @@ -84,7 +83,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, client.admin().indices().analyze(analyzeRequest, new RestToXContentListener(channel)); } - public static void buildFromContent(BytesReference content, AnalyzeRequest analyzeRequest) throws IllegalArgumentException { + public static void buildFromContent(BytesReference content, AnalyzeRequest analyzeRequest) { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { throw new IllegalArgumentException("Malforrmed content, must start with an object"); diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java index 678965adc8599..7e4e56710b740 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java @@ -21,7 +21,6 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.collect.ImmutableList; -import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.get.GetIndexRequest; import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature; import org.elasticsearch.action.admin.indices.get.GetIndexResponse; @@ -162,4 +161,4 @@ static class Fields { static final XContentBuilderString WARMERS = new XContentBuilderString("warmers"); } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java b/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java index a5d5b89d1a0ab..58dcfa5097350 100644 --- a/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java +++ b/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.count; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.count.CountRequest; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java b/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java index aeb903aafd2f8..ce306c6563d8d 100644 --- a/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java +++ b/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java @@ -20,7 +20,6 @@ package org.elasticsearch.rest.action.explain; import org.apache.lucene.search.Explanation; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.explain.ExplainRequest; import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.action.support.QuerySourceBuilder; diff --git a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java index c519238ea8c63..d95ef3e94988a 100644 --- a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java +++ b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.index; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionWriteResponse; import org.elasticsearch.action.WriteConsistencyLevel; import org.elasticsearch.action.index.IndexRequest; diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java index 46504cbf6bfd8..d63a39ac55571 100644 --- a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java +++ b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.rest.action.script; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse; diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java index 4fc2c2f00ad0f..5efd2584b38e7 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.ClearScrollRequest; import org.elasticsearch.action.search.ClearScrollResponse; import org.elasticsearch.client.Client; @@ -78,7 +77,7 @@ public static String[] splitScrollIds(String scrollIds) { return Strings.splitStringByCommaToArray(scrollIds); } - public static void buildFromContent(BytesReference content, ClearScrollRequest clearScrollRequest) throws IllegalArgumentException { + public static void buildFromContent(BytesReference content, ClearScrollRequest clearScrollRequest) { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { throw new IllegalArgumentException("Malformed content, must start with an object"); diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java index b503720463982..9c3e85a2e9406 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java index 86549b93fad1d..15de56265bca4 100644 --- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java +++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.search; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.client.Client; @@ -83,7 +82,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel, client.searchScroll(searchScrollRequest, new RestStatusToXContentListener(channel)); } - public static void buildFromContent(BytesReference content, SearchScrollRequest searchScrollRequest) throws IllegalArgumentException { + public static void buildFromContent(BytesReference content, SearchScrollRequest searchScrollRequest) { try (XContentParser parser = XContentHelper.createParser(content)) { if (parser.nextToken() != XContentParser.Token.START_OBJECT) { throw new IllegalArgumentException("Malforrmed content, must start with an object"); diff --git a/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java b/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java index 4af6e7b59e66a..9f9c3946b36f0 100644 --- a/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java +++ b/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java @@ -22,7 +22,6 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastShardsHeader; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.suggest.SuggestRequest; import org.elasticsearch.action.suggest.SuggestResponse; import org.elasticsearch.action.support.IndicesOptions; diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java index 4a17a1b17dcce..8bd59f1e8a9ee 100644 --- a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java +++ b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java @@ -19,7 +19,6 @@ package org.elasticsearch.rest.action.support; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; diff --git a/src/main/java/org/elasticsearch/river/RiversManager.java b/src/main/java/org/elasticsearch/river/RiversManager.java index 30d67d4cc2f04..42d7021a5f340 100644 --- a/src/main/java/org/elasticsearch/river/RiversManager.java +++ b/src/main/java/org/elasticsearch/river/RiversManager.java @@ -46,21 +46,21 @@ public RiversManager(Settings settings, RiversService riversService, RiverCluste } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { riversRouter.start(); riversService.start(); clusterService.start(); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { riversRouter.stop(); clusterService.stop(); riversService.stop(); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { riversRouter.close(); clusterService.close(); riversService.close(); diff --git a/src/main/java/org/elasticsearch/river/RiversService.java b/src/main/java/org/elasticsearch/river/RiversService.java index 0d7863a64685f..ed7369d8ad0f9 100644 --- a/src/main/java/org/elasticsearch/river/RiversService.java +++ b/src/main/java/org/elasticsearch/river/RiversService.java @@ -88,11 +88,11 @@ public RiversService(Settings settings, Client client, ThreadPool threadPool, Cl } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { ImmutableSet indices = ImmutableSet.copyOf(this.rivers.keySet()); final CountDownLatch latch = new CountDownLatch(indices.size()); for (final RiverName riverName : indices) { @@ -117,10 +117,10 @@ public void run() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } - public synchronized void createRiver(RiverName riverName, Map settings) throws ElasticsearchException { + public synchronized void createRiver(RiverName riverName, Map settings) { if (riversInjectors.containsKey(riverName)) { logger.warn("ignoring river [{}][{}] creation, already exists", riverName.type(), riverName.name()); return; @@ -182,7 +182,7 @@ public synchronized void createRiver(RiverName riverName, Map se } } - public synchronized void closeRiver(RiverName riverName) throws ElasticsearchException { + public synchronized void closeRiver(RiverName riverName) { Injector riverInjector; River river; synchronized (this) { diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java b/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java index 49488c889f215..11a0350a40d6a 100644 --- a/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java +++ b/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java @@ -59,12 +59,12 @@ public RiverClusterService(Settings settings, TransportService transportService, } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { this.updateTasksExecutor = newSingleThreadExecutor(daemonThreadFactory(settings, "riverClusterService#updateTask")); } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { updateTasksExecutor.shutdown(); try { updateTasksExecutor.awaitTermination(10, TimeUnit.SECONDS); @@ -74,7 +74,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } public void add(RiverClusterStateListener listener) { diff --git a/src/main/java/org/elasticsearch/river/routing/RiversRouter.java b/src/main/java/org/elasticsearch/river/routing/RiversRouter.java index 5984b24dc8225..288d6ff0d16dd 100644 --- a/src/main/java/org/elasticsearch/river/routing/RiversRouter.java +++ b/src/main/java/org/elasticsearch/river/routing/RiversRouter.java @@ -83,15 +83,15 @@ public RiversRouter(Settings settings, Client client, ClusterService clusterServ } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java b/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java index e91567d8e3e2f..70bf27b82e49d 100644 --- a/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java +++ b/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; @@ -108,4 +107,4 @@ public void close() { public void scriptRemoved(CompiledScript script) { // Nothing to do here } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/script/Script.java b/src/main/java/org/elasticsearch/script/Script.java index 23cc02f529eed..655ff82c08e32 100644 --- a/src/main/java/org/elasticsearch/script/Script.java +++ b/src/main/java/org/elasticsearch/script/Script.java @@ -21,7 +21,6 @@ import java.util.Map; -import java.lang.IllegalArgumentException; import static org.elasticsearch.script.ScriptService.ScriptType; diff --git a/src/main/java/org/elasticsearch/script/ScriptContext.java b/src/main/java/org/elasticsearch/script/ScriptContext.java index 7fbaaf8468430..a12fc85a53c80 100644 --- a/src/main/java/org/elasticsearch/script/ScriptContext.java +++ b/src/main/java/org/elasticsearch/script/ScriptContext.java @@ -19,7 +19,6 @@ package org.elasticsearch.script; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; /** diff --git a/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java b/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java index 643a06ad4bf26..614e41e1c1197 100644 --- a/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java +++ b/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import java.util.Map; diff --git a/src/main/java/org/elasticsearch/script/ScriptMode.java b/src/main/java/org/elasticsearch/script/ScriptMode.java index b7fb7474e7346..b35dda716e449 100644 --- a/src/main/java/org/elasticsearch/script/ScriptMode.java +++ b/src/main/java/org/elasticsearch/script/ScriptMode.java @@ -19,7 +19,6 @@ package org.elasticsearch.script; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Booleans; import java.util.Locale; diff --git a/src/main/java/org/elasticsearch/script/ScriptModes.java b/src/main/java/org/elasticsearch/script/ScriptModes.java index 36c3c457697ee..7411e3a0592ef 100644 --- a/src/main/java/org/elasticsearch/script/ScriptModes.java +++ b/src/main/java/org/elasticsearch/script/ScriptModes.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.ScriptService.ScriptType; diff --git a/src/main/java/org/elasticsearch/script/ScriptModule.java b/src/main/java/org/elasticsearch/script/ScriptModule.java index 92f15cf2f6589..2cc12e13d85c0 100644 --- a/src/main/java/org/elasticsearch/script/ScriptModule.java +++ b/src/main/java/org/elasticsearch/script/ScriptModule.java @@ -21,7 +21,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; import org.elasticsearch.common.inject.multibindings.Multibinder; diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java index 53173e639ca2a..8e363068c3079 100644 --- a/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/src/main/java/org/elasticsearch/script/ScriptService.java @@ -27,8 +27,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; diff --git a/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java b/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java index d37efc68201c2..9f4067a59974a 100644 --- a/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java +++ b/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java @@ -26,7 +26,6 @@ import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.Scorer; -import java.lang.IllegalStateException; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.script.SearchScript; diff --git a/src/main/java/org/elasticsearch/search/MultiValueMode.java b/src/main/java/org/elasticsearch/search/MultiValueMode.java index 30f2d7504ab09..839d4714dbe0e 100644 --- a/src/main/java/org/elasticsearch/search/MultiValueMode.java +++ b/src/main/java/org/elasticsearch/search/MultiValueMode.java @@ -27,7 +27,6 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; diff --git a/src/main/java/org/elasticsearch/search/SearchPhase.java b/src/main/java/org/elasticsearch/search/SearchPhase.java index 30013b5471c67..bdab128fecb77 100644 --- a/src/main/java/org/elasticsearch/search/SearchPhase.java +++ b/src/main/java/org/elasticsearch/search/SearchPhase.java @@ -36,5 +36,5 @@ public interface SearchPhase { */ void preProcess(SearchContext context); - void execute(SearchContext context) throws ElasticsearchException; + void execute(SearchContext context); } diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java index dfbfb84e0fe05..369c2cb499bfd 100644 --- a/src/main/java/org/elasticsearch/search/SearchService.java +++ b/src/main/java/org/elasticsearch/search/SearchService.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.TopDocs; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.search.SearchType; @@ -193,23 +192,23 @@ protected SearchContext removeContext(long id) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { for (final SearchContext context : activeContexts.values()) { freeContext(context.id()); } } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { doStop(); FutureUtils.cancel(keepAliveReaper); } - public DfsSearchResult executeDfsPhase(ShardSearchRequest request) throws ElasticsearchException { + public DfsSearchResult executeDfsPhase(ShardSearchRequest request) { final SearchContext context = createAndPutContext(request); try { contextProcessing(context); @@ -225,7 +224,7 @@ public DfsSearchResult executeDfsPhase(ShardSearchRequest request) throws Elasti } } - public QuerySearchResult executeScan(ShardSearchRequest request) throws ElasticsearchException { + public QuerySearchResult executeScan(ShardSearchRequest request) { final SearchContext context = createAndPutContext(request); final int originalSize = context.size(); try { @@ -256,7 +255,7 @@ public QuerySearchResult executeScan(ShardSearchRequest request) throws Elastics } } - public ScrollQueryFetchSearchResult executeScan(InternalScrollSearchRequest request) throws ElasticsearchException { + public ScrollQueryFetchSearchResult executeScan(InternalScrollSearchRequest request) { final SearchContext context = findContext(request.id()); contextProcessing(context); try { @@ -297,7 +296,7 @@ private void loadOrExecuteQueryPhase(final ShardSearchRequest request, final Sea } } - public QuerySearchResultProvider executeQueryPhase(ShardSearchRequest request) throws ElasticsearchException { + public QuerySearchResultProvider executeQueryPhase(ShardSearchRequest request) { final SearchContext context = createAndPutContext(request); try { context.indexShard().searchService().onPreQueryPhase(context); @@ -328,7 +327,7 @@ public QuerySearchResultProvider executeQueryPhase(ShardSearchRequest request) t } } - public ScrollQuerySearchResult executeQueryPhase(InternalScrollSearchRequest request) throws ElasticsearchException { + public ScrollQuerySearchResult executeQueryPhase(InternalScrollSearchRequest request) { final SearchContext context = findContext(request.id()); try { context.indexShard().searchService().onPreQueryPhase(context); @@ -349,7 +348,7 @@ public ScrollQuerySearchResult executeQueryPhase(InternalScrollSearchRequest req } } - public QuerySearchResult executeQueryPhase(QuerySearchRequest request) throws ElasticsearchException { + public QuerySearchResult executeQueryPhase(QuerySearchRequest request) { final SearchContext context = findContext(request.id()); contextProcessing(context); try { @@ -381,7 +380,7 @@ public QuerySearchResult executeQueryPhase(QuerySearchRequest request) throws El } } - public QueryFetchSearchResult executeFetchPhase(ShardSearchRequest request) throws ElasticsearchException { + public QueryFetchSearchResult executeFetchPhase(ShardSearchRequest request) { final SearchContext context = createAndPutContext(request); contextProcessing(context); try { @@ -419,7 +418,7 @@ public QueryFetchSearchResult executeFetchPhase(ShardSearchRequest request) thro } } - public QueryFetchSearchResult executeFetchPhase(QuerySearchRequest request) throws ElasticsearchException { + public QueryFetchSearchResult executeFetchPhase(QuerySearchRequest request) { final SearchContext context = findContext(request.id()); contextProcessing(context); try { @@ -464,7 +463,7 @@ public QueryFetchSearchResult executeFetchPhase(QuerySearchRequest request) thro } } - public ScrollQueryFetchSearchResult executeFetchPhase(InternalScrollSearchRequest request) throws ElasticsearchException { + public ScrollQueryFetchSearchResult executeFetchPhase(InternalScrollSearchRequest request) { final SearchContext context = findContext(request.id()); contextProcessing(context); try { @@ -503,7 +502,7 @@ public ScrollQueryFetchSearchResult executeFetchPhase(InternalScrollSearchReques } } - public FetchSearchResult executeFetchPhase(ShardFetchRequest request) throws ElasticsearchException { + public FetchSearchResult executeFetchPhase(ShardFetchRequest request) { final SearchContext context = findContext(request.id()); contextProcessing(context); try { @@ -540,7 +539,7 @@ private SearchContext findContext(long id) throws SearchContextMissingException return context; } - final SearchContext createAndPutContext(ShardSearchRequest request) throws ElasticsearchException { + final SearchContext createAndPutContext(ShardSearchRequest request) { SearchContext context = createContext(request, null); boolean success = false; try { @@ -555,7 +554,7 @@ final SearchContext createAndPutContext(ShardSearchRequest request) throws Elast } } - final SearchContext createContext(ShardSearchRequest request, @Nullable Engine.Searcher searcher) throws ElasticsearchException { + final SearchContext createContext(ShardSearchRequest request, @Nullable Engine.Searcher searcher) { IndexService indexService = indicesService.indexServiceSafe(request.index()); IndexShard indexShard = indexService.shardSafe(request.shardId()); diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java b/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java index 118b37e386d0b..a687eb23bd72e 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java +++ b/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java @@ -93,7 +93,7 @@ public void preProcess(SearchContext context) { } @Override - public void execute(SearchContext context) throws ElasticsearchException { + public void execute(SearchContext context) { if (context.aggregations() == null) { context.queryResult().aggregations(null); return; diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java index 08c9cef997d9f..99aa5f6aefdfd 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java +++ b/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.support.AggregationContext; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java index 091c1361634ff..ceefcae41b62b 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java +++ b/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java @@ -25,7 +25,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java index 035db21d59d26..f7c4fc9809b9c 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import java.util.List; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index f4e2c169c9c7b..8a379d1ad8228 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -22,7 +22,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; -import java.lang.IllegalStateException; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.LongHash; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java index 51b7e968f0f78..95bc28ef35a9a 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.search.TopScoreDocCollector; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.BucketCollector; import org.elasticsearch.search.aggregations.LeafBucketCollector; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java index 9f0ce6c3c339a..0b51a53be81ae 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java @@ -21,7 +21,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.BucketCollector; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -74,7 +73,7 @@ public boolean needsScores() { } @Override - public void close() throws ElasticsearchException { + public void close() { in.close(); } @@ -128,4 +127,4 @@ public void postCollection() throws IOException { } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java index a212d107083c4..29f39539293b1 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java index 0c70f787247a8..2f1864458d7ec 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java @@ -24,7 +24,6 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Filter; import org.apache.lucene.util.Bits; -import java.lang.IllegalStateException; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.util.LongArray; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java index 557b6b85971ab..9f382d86906bb 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket.geogrid; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java index 36b32d08d39dd..da2f27fe85223 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket.global; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalStateException; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java index fb1d2973201c3..518240cd1cfb4 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java @@ -22,7 +22,6 @@ import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.PriorityQueue; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java index 5a65715468496..be81fc33719fc 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java index 3f967400d9b55..9774dddd3911f 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.TopDocsCollector; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BytesRefHash; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java index 750b674026039..c813a4ec08447 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.DiversifiedTopDocsCollector.ScoreDocKey; import org.apache.lucene.search.TopDocsCollector; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.bucket.BestDocsDeferringCollector; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java index 6986fef258736..407ba512f7f4e 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.DiversifiedTopDocsCollector; import org.apache.lucene.search.DiversifiedTopDocsCollector.ScoreDocKey; import org.apache.lucene.search.TopDocsCollector; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.bucket.BestDocsDeferringCollector; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java index 87897b12e8f79..d4a078c28827c 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket.sampler; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java index adf97c5a65ec3..8f84be12770da 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java @@ -24,7 +24,6 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.index.FilterableTermsEnum; @@ -253,7 +252,7 @@ public long getBackgroundFrequency(long term) { } @Override - public void close() throws ElasticsearchException { + public void close() { try { if (termsEnum instanceof Releasable) { ((Releasable) termsEnum).close(); diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java index be5de56ec4a89..961ca04872bee 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket.significant; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.FilterBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java index c50893877ded1..a8f84c8070a85 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.aggregations.bucket.significant.heuristics; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java index f57b1d5ba783a..4f12277ca0f5a 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket.significant.heuristics; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.aggregations.InternalAggregation; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java index 93985a39d224b..b1e67ca87c219 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java @@ -22,7 +22,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import java.lang.IllegalStateException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java index 3d6c47b63b812..7207c67e7427b 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket.terms; import org.apache.lucene.search.IndexSearcher; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.Aggregator; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java index adf05d96baeb4..1125abdc82684 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket.terms; import org.apache.lucene.util.automaton.RegExp; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.ValuesSourceAggregationBuilder; diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java index 6f92bb85970cc..c0488011a3517 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java @@ -34,7 +34,6 @@ import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.support.ValuesSource; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java index e6659358b6430..5fac71fc6f712 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.metrics; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.aggregations.support.format.ValueFormatter; import java.util.List; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java index e4c2acce93c74..c241d69076500 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java @@ -188,7 +188,7 @@ public void postCollect() { } @Override - public void close() throws ElasticsearchException { + public void close() { // no-op } } @@ -218,7 +218,7 @@ public void postCollect() { } @Override - public void close() throws ElasticsearchException { + public void close() { // no-op } @@ -295,7 +295,7 @@ public void postCollect() { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(visitedOrds); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java index 3866132681826..b21bd5224c399 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java @@ -406,7 +406,7 @@ private long threshold() { } @Override - public void close() throws ElasticsearchException { + public void close() { Releasables.close(runLens, hashSet.sizes); } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java index 972ab7eacd539..1d32f7b52eb34 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics.geobounds; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java index 31bc8d8ac279f..87f12155e30bb 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics.percentiles; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java index d1508174a64e0..6a076678d4f1e 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics.scripted; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java index d0af5fa671b5b..ca8168bc87c4d 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics.stats; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BigArrays; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java index b5863d8e35261..b8cca425ab4c0 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics.stats.extended; import org.apache.lucene.index.LeafReaderContext; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.internal.Nullable; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.util.BigArrays; diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java index 9bc2b42f2a548..562a673866712 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java @@ -22,7 +22,6 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopFieldDocs; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java index db4b9590036f8..14d6c5e4a7b04 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java +++ b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.support; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationExecutionException; diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java index 7f42d0b684e72..97699c37b21df 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java +++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.support.format; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index b77f86432ca8b..892cc2085aea8 100644 --- a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchGenerationException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java index b02ce1584a101..1e072a4916d7a 100644 --- a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java @@ -28,8 +28,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.util.BitDocIdSet; import org.apache.lucene.util.BitSet; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java index cbb8615da7fe7..92968309fcc2b 100644 --- a/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java @@ -116,9 +116,9 @@ public String getSourcePath(String sourcePath) { /** * Executes the hit level phase, with a reader and doc id (note, its a low level reader, and the matching doc). */ - void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException; + void hitExecute(SearchContext context, HitContext hitContext); boolean hitsExecutionNeeded(SearchContext context); - void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException; + void hitsExecute(SearchContext context, InternalSearchHit[] hits); } diff --git a/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java index 02bdfbe3cd7a4..026e421a58938 100644 --- a/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java @@ -47,7 +47,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -56,7 +56,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { try { final int topLevelDocId = hitContext.hit().docId(); Explanation explanation = context.searcher().explain(context.query(), topLevelDocId); diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java index 2fcf23c3ee3c5..922d8ce11e75e 100644 --- a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java @@ -61,7 +61,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -70,7 +70,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { for (FieldDataFieldsContext.FieldDataField field : context.fieldDataFields().fields()) { if (hitContext.hit().fieldsOrNull() == null) { hitContext.hit().fields(new HashMap(2)); diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java index 7951e52bc1898..3c45148cdfa54 100644 --- a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java +++ b/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.fetch.fielddata; -import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java index 74d0215ccfb8f..2a36797fcc879 100644 --- a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java @@ -77,7 +77,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { Map results = new HashMap<>(); for (Map.Entry entry : context.innerHits().getInnerHits().entrySet()) { InnerHitsContext.BaseInnerHits innerHits = entry.getValue(); @@ -117,7 +117,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } // To get around cyclic dependency issue diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java index 931a00df7d56c..2642b7d862afd 100644 --- a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java +++ b/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java @@ -21,7 +21,6 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperService; diff --git a/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java index 8e6197eae0ba1..50ed21776ba88 100644 --- a/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java @@ -54,7 +54,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -64,7 +64,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { List matchedQueries = Lists.newArrayListWithCapacity(2); try { diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java index b43cf006a60bb..05ec51efa77c7 100644 --- a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.search.SearchHitField; @@ -62,7 +61,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -71,7 +70,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { for (ScriptFieldsContext.ScriptField scriptField : context.scriptFields().fields()) { LeafSearchScript leafScript; try { diff --git a/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java index 76106861c80cc..445d6801e5924 100644 --- a/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java @@ -56,7 +56,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -65,7 +65,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { FetchSourceContext fetchSourceContext = context.fetchSourceContext(); assert fetchSourceContext.fetchSource(); if (fetchSourceContext.includes().length == 0 && fetchSourceContext.excludes().length == 0) { diff --git a/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java b/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java index 1c2f7d4c84677..6a5264dd62587 100644 --- a/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java +++ b/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java @@ -49,7 +49,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -58,7 +58,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { // it might make sense to cache the TermDocs on a shared fetch context and just skip here) // it is going to mean we work on the high level multi reader and not the lower level reader as is // the case below... diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java index 5a6a934d18493..161cdd490f1d3 100644 --- a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java @@ -22,7 +22,6 @@ import org.apache.lucene.search.highlight.Encoder; import org.apache.lucene.search.vectorhighlight.*; import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.StringText; diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java index a80357a18f410..cd3c12591f706 100644 --- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java +++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.regex.Regex; @@ -65,7 +64,7 @@ public boolean hitsExecutionNeeded(SearchContext context) { } @Override - public void hitsExecute(SearchContext context, InternalSearchHit[] hits) throws ElasticsearchException { + public void hitsExecute(SearchContext context, InternalSearchHit[] hits) { } @Override @@ -74,7 +73,7 @@ public boolean hitExecutionNeeded(SearchContext context) { } @Override - public void hitExecute(SearchContext context, HitContext hitContext) throws ElasticsearchException { + public void hitExecute(SearchContext context, HitContext hitContext) { Map highlightFields = newHashMap(); for (SearchContextHighlight.Field field : context.highlight().fields()) { List fieldNamesToHighlight; diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java b/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java index d05c35988e876..c4d8aa80ef59c 100644 --- a/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java +++ b/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java @@ -22,7 +22,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.lucene.search.vectorhighlight.SimpleBoundaryScanner; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.IndexQueryParserService; diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java index d1de1f5de8a8e..d7e3580ab4dcd 100644 --- a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.highlight.*; import org.apache.lucene.util.CollectionUtil; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.text.StringText; import org.elasticsearch.common.text.Text; import org.elasticsearch.index.mapper.FieldMapper; diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java index 8ad5a060a73ad..8b227e1d2244a 100644 --- a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java +++ b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java @@ -41,7 +41,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.UnicodeUtil; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.text.StringText; diff --git a/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java b/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java index e4b7070b8c319..f083968876142 100644 --- a/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java +++ b/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java @@ -207,7 +207,7 @@ public DefaultSearchContext(long id, ShardSearchRequest request, SearchShardTarg } @Override - public void doClose() throws ElasticsearchException { + public void doClose() { if (scanContext != null) { scanContext.clear(); } diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java index 4c7a190672318..7ae314e475653 100644 --- a/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java +++ b/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.lookup; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldDataService; import org.elasticsearch.index.fielddata.ScriptDocValues; diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java index ccc81a1b68441..52e0872742ae0 100644 --- a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java +++ b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java @@ -22,7 +22,6 @@ import com.google.common.collect.Maps; import org.apache.lucene.index.LeafReader; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.fieldvisitor.SingleFieldsVisitor; diff --git a/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java b/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java index 1d39b4320089c..fc4b64fe9aca9 100644 --- a/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java +++ b/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.query; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.SearchContext; diff --git a/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java index 9f63a59cd6b4a..f83a6030e7adb 100644 --- a/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java +++ b/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java @@ -24,8 +24,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.query.ParsedQuery; diff --git a/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java b/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java index ecabfe6856f5b..7f9f2725fbc27 100644 --- a/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java +++ b/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.rescore; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchParseElement; diff --git a/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java index 1c8f8bab840ab..88d2b0aae6014 100644 --- a/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java +++ b/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java @@ -54,7 +54,7 @@ public void preProcess(SearchContext context) { } @Override - public void execute(SearchContext context) throws ElasticsearchException { + public void execute(SearchContext context) { try { TopDocs topDocs = context.queryResult().topDocs(); for (RescoreSearchContext ctx : context.rescore()) { diff --git a/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java index fa8fb6790975b..9e3f86dcf7283 100644 --- a/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java +++ b/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.sort; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.FilterBuilder; diff --git a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java index e78d90be38f1c..4993c42662952 100644 --- a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java +++ b/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.join.BitDocIdSetFilter; import org.apache.lucene.util.BitSet; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoDistance.FixedSourceDistance; diff --git a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java index bb7656a9ebcfd..4723f427dbb1f 100644 --- a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java +++ b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.join.BitDocIdSetFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.lucene.search.Queries; diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/src/main/java/org/elasticsearch/search/suggest/Suggest.java index f4057cacc0cc7..8a1f5f1263639 100644 --- a/src/main/java/org/elasticsearch/search/suggest/Suggest.java +++ b/src/main/java/org/elasticsearch/search/suggest/Suggest.java @@ -20,7 +20,6 @@ import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java index 652d7e3a7ed73..5399820dd94b1 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; -import java.lang.IllegalArgumentException; import org.elasticsearch.client.Requests; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java b/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java index 2a25215eb9ae9..edfe04108a0b9 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.suggest; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MapperService; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java b/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java index 05023ba0f423d..209c7b68ce771 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java @@ -66,7 +66,7 @@ public void preProcess(SearchContext context) { } @Override - public void execute(SearchContext context) throws ElasticsearchException { + public void execute(SearchContext context) { final SuggestionSearchContext suggest = context.suggest(); if (suggest == null) { return; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java index c28201bfd92b7..aaa37ecbdfe97 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java @@ -29,7 +29,6 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.automaton.LevenshteinAutomata; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.FastCharArrayReader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java index 59aecba1e060b..2cb36f5391453 100644 --- a/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java +++ b/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java @@ -20,7 +20,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java b/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java index 88be9d2a22f8c..5ffe9501dc965 100644 --- a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java +++ b/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java @@ -44,7 +44,6 @@ import org.apache.lucene.util.Accountables; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import java.lang.IllegalStateException; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java index bbf65de6a4506..05a14291cad8c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.suggest.completion; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.unit.Fuzziness; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java index 9f615eb9f6d6e..d97f7cf44e53c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -26,7 +26,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.search.suggest.SuggestUtils; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java index 18e974336b587..7905d5388487c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java @@ -22,7 +22,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Terms; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index a66c715f3bc1c..ef320eb60e51f 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.suggest.phrase; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder; diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java index cc20d356e0a7c..7115b7a629a9c 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.cluster.routing.Preference; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; @@ -230,4 +229,4 @@ boolean collatePrune() { return prune; } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java index ce85a65206431..9557715bcb94e 100644 --- a/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java +++ b/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.lucene.index.FreqTermsEnum; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.Candidate; diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java index b16937bb41743..94ef1f6b39379 100644 --- a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java +++ b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java @@ -20,7 +20,6 @@ import java.io.IOException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotState.java b/src/main/java/org/elasticsearch/snapshots/SnapshotState.java index 41eaa27160477..b893a372d1374 100644 --- a/src/main/java/org/elasticsearch/snapshots/SnapshotState.java +++ b/src/main/java/org/elasticsearch/snapshots/SnapshotState.java @@ -19,7 +19,6 @@ package org.elasticsearch.snapshots; -import java.lang.IllegalArgumentException; /** * Represents the state that a snapshot can be in diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index 54693726d6d7e..bc00f9c7f180b 100644 --- a/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -247,7 +247,7 @@ public TimeValue timeout() { * @param state current cluster state * @throws org.elasticsearch.ElasticsearchException */ - private void validate(SnapshotRequest request, ClusterState state) throws ElasticsearchException { + private void validate(SnapshotRequest request, ClusterState state) { RepositoriesMetaData repositoriesMetaData = state.getMetaData().custom(RepositoriesMetaData.TYPE); if (repositoriesMetaData == null || repositoriesMetaData.repository(request.repository()) == null) { throw new RepositoryMissingException(request.repository()); @@ -1305,12 +1305,12 @@ public void removeListener(SnapshotCompletionListener listener) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { shutdownLock.lock(); try { while(!shardSnapshots.isEmpty() && shutdownCondition.await(5, TimeUnit.SECONDS)) { @@ -1324,7 +1324,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java index 80d99563adac3..5eee98529685b 100644 --- a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java +++ b/src/main/java/org/elasticsearch/threadpool/ThreadPool.java @@ -24,7 +24,6 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; import org.apache.lucene.util.Counter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; diff --git a/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java index dc337b431462a..8cbe6b4c96091 100644 --- a/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java +++ b/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java @@ -20,7 +20,6 @@ package org.elasticsearch.transport; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.common.util.concurrent.BaseFuture; @@ -40,7 +39,7 @@ public PlainTransportFuture(TransportResponseHandler handler) { } @Override - public V txGet() throws ElasticsearchException { + public V txGet() { try { return get(); } catch (InterruptedException e) { @@ -56,7 +55,7 @@ public V txGet() throws ElasticsearchException { } @Override - public V txGet(long timeout, TimeUnit unit) throws ElasticsearchException { + public V txGet(long timeout, TimeUnit unit) { try { return get(timeout, unit); } catch (TimeoutException e) { diff --git a/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java index 10be853ccc7c8..2b8caf8f0550f 100644 --- a/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java +++ b/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport; -import java.lang.IllegalStateException; import java.lang.reflect.Constructor; diff --git a/src/main/java/org/elasticsearch/transport/TransportFuture.java b/src/main/java/org/elasticsearch/transport/TransportFuture.java index 1b330d2b1dca6..c4bfcb7afeabf 100644 --- a/src/main/java/org/elasticsearch/transport/TransportFuture.java +++ b/src/main/java/org/elasticsearch/transport/TransportFuture.java @@ -33,12 +33,12 @@ public interface TransportFuture extends Future { * Waits if necessary for the computation to complete, and then * retrieves its result. */ - V txGet() throws ElasticsearchException; + V txGet(); /** * Waits if necessary for at most the given time for the computation * to complete, and then retrieves its result, if available. */ - V txGet(long timeout, TimeUnit unit) throws ElasticsearchException; + V txGet(long timeout, TimeUnit unit); } diff --git a/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java index f8a1e1fb5447c..0d92d00f1440b 100644 --- a/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java +++ b/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java index bc031d71d9adb..7b635d0f8514a 100644 --- a/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/src/main/java/org/elasticsearch/transport/TransportService.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.settings.ClusterDynamicSettings; import org.elasticsearch.cluster.settings.DynamicSettings; @@ -160,7 +159,7 @@ public void applySettings(Settings settings) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { adapter.rxMetric.clear(); adapter.txMetric.clear(); transport.transportServiceAdapter(adapter); @@ -173,7 +172,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { final boolean setStopped = started.compareAndSet(true, false); assert setStopped : "service has already been stopped"; try { @@ -198,7 +197,7 @@ public void run() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { transport.close(); } @@ -794,4 +793,4 @@ protected void processException(final TransportResponseHandler handler, final Re } } -} \ No newline at end of file +} diff --git a/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/src/main/java/org/elasticsearch/transport/local/LocalTransport.java index 1fe81dfecfc72..98b22438425e4 100644 --- a/src/main/java/org/elasticsearch/transport/local/LocalTransport.java +++ b/src/main/java/org/elasticsearch/transport/local/LocalTransport.java @@ -96,7 +96,7 @@ public boolean addressSupported(Class address) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { String address = settings.get(TRANSPORT_LOCAL_ADDRESS); if (address == null) { address = Long.toString(transportAddressIdGenerator.incrementAndGet()); @@ -110,7 +110,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { transports.remove(localAddress); // now, go over all the transports connected to me, and raise disconnected event for (final LocalTransport targetTransport : transports.values()) { @@ -123,7 +123,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { ThreadPool.terminate(workers, 10, TimeUnit.SECONDS); } diff --git a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java index 0a8e718738563..b0689df6f2cad 100644 --- a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java +++ b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport.netty; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.common.component.Lifecycle; import org.elasticsearch.common.compress.Compressor; diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java index f098f7d855656..e2ad4efe3f537 100644 --- a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java +++ b/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java @@ -234,7 +234,7 @@ ThreadPool threadPool() { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { boolean success = false; try { clientBootstrap = createClientBootstrap(); @@ -487,7 +487,7 @@ private void createServerBootstrap(String name, Settings settings) { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { final CountDownLatch latch = new CountDownLatch(1); // make sure we run it on another thread than a possible IO handler thread threadPool.generic().execute(new Runnable() { @@ -559,7 +559,7 @@ public void run() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/main/java/org/elasticsearch/tribe/TribeService.java b/src/main/java/org/elasticsearch/tribe/TribeService.java index 3994cbacaff67..51cb9d0ecab4d 100644 --- a/src/main/java/org/elasticsearch/tribe/TribeService.java +++ b/src/main/java/org/elasticsearch/tribe/TribeService.java @@ -164,7 +164,7 @@ public TribeService(Settings settings, ClusterService clusterService, DiscoveryS } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { for (Node node : nodes) { try { node.start(); @@ -186,12 +186,12 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { doClose(); } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { for (Node node : nodes) { try { node.close(); diff --git a/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java index a1f99108883a0..90e37447bb597 100644 --- a/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java +++ b/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java @@ -19,7 +19,6 @@ package org.elasticsearch.watcher; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -92,7 +91,7 @@ public ResourceWatcherService(Settings settings, ThreadPool threadPool) { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { if (!enabled) { return; } @@ -102,7 +101,7 @@ protected void doStart() throws ElasticsearchException { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { if (!enabled) { return; } @@ -112,7 +111,7 @@ protected void doStop() throws ElasticsearchException { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } /** diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java index 972acfd09a6bd..a8318101bf2cc 100644 --- a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java +++ b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.indices.create; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java index 8d864e313439c..a8aead541c78e 100644 --- a/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java +++ b/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.action.index; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationOperationTests.java b/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationOperationTests.java index 9503e05333136..a28c78ccd34d5 100644 --- a/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationOperationTests.java +++ b/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationOperationTests.java @@ -536,7 +536,7 @@ protected void shardOperationOnReplica(ShardId shardId, Request request) { } @Override - protected ShardIterator shards(ClusterState clusterState, InternalRequest request) throws ElasticsearchException { + protected ShardIterator shards(ClusterState clusterState, InternalRequest request) { return clusterState.getRoutingTable().index(request.concreteIndex()).shard(request.request().shardId).shardsIt(); } diff --git a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java b/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java index 10d870e0f9a59..f85428cfbaed2 100644 --- a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java +++ b/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java @@ -62,7 +62,7 @@ public Settings indexSettings() { } @Test - public void testSimpleTermVectors() throws ElasticsearchException, IOException { + public void testSimpleTermVectors() throws IOException { XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type1") .startObject("properties") .startObject("field") diff --git a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java b/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java index d99d03ec0b481..5828f64467057 100644 --- a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java +++ b/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java @@ -184,7 +184,7 @@ public void testNotIndexedField() throws Exception { } @Test - public void testSimpleTermVectors() throws ElasticsearchException, IOException { + public void testSimpleTermVectors() throws IOException { XContentBuilder mapping = jsonBuilder().startObject().startObject("type1") .startObject("properties") .startObject("field") @@ -222,7 +222,7 @@ public void testSimpleTermVectors() throws ElasticsearchException, IOException { } @Test - public void testRandomSingleTermVectors() throws ElasticsearchException, IOException { + public void testRandomSingleTermVectors() throws IOException { FieldType ft = new FieldType(); int config = randomInt(6); boolean storePositions = false; @@ -410,7 +410,7 @@ public void testDuelESLucene() throws Exception { } @Test - public void testRandomPayloadWithDelimitedPayloadTokenFilter() throws ElasticsearchException, IOException { + public void testRandomPayloadWithDelimitedPayloadTokenFilter() throws IOException { //create the test document int encoding = randomIntBetween(0, 2); String encodingString = ""; @@ -578,7 +578,7 @@ private String[] crateRandomTokens() { // like testSimpleTermVectors but we create fields with no term vectors @Test - public void testSimpleTermVectorsWithGenerate() throws ElasticsearchException, IOException { + public void testSimpleTermVectorsWithGenerate() throws IOException { String[] fieldNames = new String[10]; for (int i = 0; i < fieldNames.length; i++) { fieldNames[i] = "field" + String.valueOf(i); @@ -630,7 +630,7 @@ public void testSimpleTermVectorsWithGenerate() throws ElasticsearchException, I } } - private void checkBrownFoxTermVector(Fields fields, String fieldName, boolean withPayloads) throws ElasticsearchException, IOException { + private void checkBrownFoxTermVector(Fields fields, String fieldName, boolean withPayloads) throws IOException { String[] values = {"brown", "dog", "fox", "jumps", "lazy", "over", "quick", "the"}; int[] freq = {1, 1, 1, 1, 1, 1, 1, 2}; int[][] pos = {{2}, {8}, {3}, {4}, {7}, {5}, {1}, {0, 6}}; @@ -671,7 +671,7 @@ private void checkBrownFoxTermVector(Fields fields, String fieldName, boolean wi } @Test - public void testDuelWithAndWithoutTermVectors() throws ElasticsearchException, IOException, ExecutionException, InterruptedException { + public void testDuelWithAndWithoutTermVectors() throws IOException, ExecutionException, InterruptedException { // setup indices String[] indexNames = new String[] {"with_tv", "without_tv"}; assertAcked(prepareCreate(indexNames[0]) @@ -760,7 +760,7 @@ private void compareTermVectors(String fieldName, Fields fields0, Fields fields1 } @Test - public void testSimpleWildCards() throws ElasticsearchException, IOException { + public void testSimpleWildCards() throws IOException { int numFields = 25; XContentBuilder mapping = jsonBuilder().startObject().startObject("type1").startObject("properties"); @@ -788,7 +788,7 @@ public void testSimpleWildCards() throws ElasticsearchException, IOException { } @Test - public void testArtificialVsExisting() throws ElasticsearchException, ExecutionException, InterruptedException, IOException { + public void testArtificialVsExisting() throws ExecutionException, InterruptedException, IOException { // setup indices ImmutableSettings.Builder settings = settingsBuilder() .put(indexSettings()) @@ -924,7 +924,7 @@ public void testArtificialNonExistingField() throws Exception { } @Test - public void testPerFieldAnalyzer() throws ElasticsearchException, IOException { + public void testPerFieldAnalyzer() throws IOException { int numFields = 25; // setup mapping and document source @@ -1021,7 +1021,7 @@ private static String indexOrAlias() { } @Test - public void testDfs() throws ElasticsearchException, ExecutionException, InterruptedException, IOException { + public void testDfs() throws ExecutionException, InterruptedException, IOException { logger.info("Setting up the index ..."); ImmutableSettings.Builder settings = settingsBuilder() .put(indexSettings()) diff --git a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java index 511f982272fa9..9a319f77b9ece 100644 --- a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java +++ b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.aliases; import org.apache.lucene.util.LuceneTestCase.Slow; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; diff --git a/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java b/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java index fa8b212101e8d..05723ac1b6909 100644 --- a/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java +++ b/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java @@ -21,7 +21,6 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.index.Fields; import org.apache.lucene.util.English; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; diff --git a/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java b/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java index fc722c46c8c59..fcf64e05187cd 100644 --- a/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java +++ b/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java @@ -173,17 +173,17 @@ public void removeLifecycleListener(LifecycleListener listener) { } @Override - public Transport start() throws ElasticsearchException { + public Transport start() { return null; } @Override - public Transport stop() throws ElasticsearchException { + public Transport stop() { return null; } @Override - public void close() throws ElasticsearchException { + public void close() { } diff --git a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java index cd393ff88cdda..2abb769f7489b 100644 --- a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java @@ -816,15 +816,15 @@ public boolean master() { } @Override - protected void doStart() throws ElasticsearchException { + protected void doStart() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { } @Override - protected void doClose() throws ElasticsearchException { + protected void doClose() { } @Override diff --git a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java index a91d12fa3398a..55b4a932c3aee 100644 --- a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java +++ b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.test.ElasticsearchIntegrationTest; diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java index 7aa06ea0c0616..8576e0f19b0e9 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java @@ -21,7 +21,6 @@ import com.google.common.collect.Sets; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.metadata.IndexMetaData.State; diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index 1c38a22c52621..7a1ffaecff6f3 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.cluster.routing.allocation; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index 2b782f92d2c0f..3eb177643cd52 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -21,7 +21,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterInfo; import org.elasticsearch.cluster.ClusterInfoService; diff --git a/src/test/java/org/elasticsearch/common/BooleansTests.java b/src/test/java/org/elasticsearch/common/BooleansTests.java index 0869f3ba772c1..3bacaed7f5af5 100644 --- a/src/test/java/org/elasticsearch/common/BooleansTests.java +++ b/src/test/java/org/elasticsearch/common/BooleansTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/src/test/java/org/elasticsearch/common/ParseFieldTests.java index 8897e60e5d714..7b0dacf85000a 100644 --- a/src/test/java/org/elasticsearch/common/ParseFieldTests.java +++ b/src/test/java/org/elasticsearch/common/ParseFieldTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; import org.apache.commons.lang3.ArrayUtils; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/common/PidFileTests.java b/src/test/java/org/elasticsearch/common/PidFileTests.java index 1593ffe512c2c..02f92f5b979fe 100644 --- a/src/test/java/org/elasticsearch/common/PidFileTests.java +++ b/src/test/java/org/elasticsearch/common/PidFileTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.common; import com.google.common.base.Charsets; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/common/TableTests.java b/src/test/java/org/elasticsearch/common/TableTests.java index d9c608881e614..032299cd1b26e 100644 --- a/src/test/java/org/elasticsearch/common/TableTests.java +++ b/src/test/java/org/elasticsearch/common/TableTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.common; -import java.lang.IllegalStateException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java index 66127c0618b2d..f86f4cf85562f 100644 --- a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java +++ b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.common.collect; import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.collect.ImmutableMap; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import java.util.HashMap; diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java index 8028781bda639..f489c47bc4a16 100644 --- a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java +++ b/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.common.collect; import com.google.common.collect.ImmutableSet; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import java.util.HashSet; diff --git a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java index 4da1582f090ee..9a06b10d81792 100644 --- a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java +++ b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java @@ -27,7 +27,6 @@ import com.spatial4j.core.shape.jts.JtsGeometry; import com.spatial4j.core.shape.jts.JtsPoint; import com.vividsolutions.jts.geom.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java b/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java index 20c327410f813..60d161b41216d 100644 --- a/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java +++ b/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.recycler; -import java.lang.IllegalStateException; import org.elasticsearch.common.recycler.Recycler.V; import org.elasticsearch.test.ElasticsearchTestCase; diff --git a/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java index 9bfc5af98f6de..5e0ab4f3b08ef 100644 --- a/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.common.unit; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java index 0f77e83c03ab3..3e8b6dd82185f 100644 --- a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java +++ b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java @@ -818,7 +818,7 @@ public void testNumericTermsAndRanges() throws Exception { } @Test // see #2994 - public void testSimpleSpan() throws ElasticsearchException, IOException { + public void testSimpleSpan() throws IOException { createIndex("test"); ensureGreen(); diff --git a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java b/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java index 08ffca233a21c..169dbdbe4a2a8 100644 --- a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java @@ -19,7 +19,6 @@ package org.elasticsearch.discovery.zen; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNodes; diff --git a/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java index 31045dcb451ec..f84457dab3b54 100644 --- a/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java +++ b/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java @@ -21,7 +21,6 @@ import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.ImmutableSettings; diff --git a/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java b/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java index ef845b088859b..97231bec4428b 100644 --- a/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.fieldstats; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.action.fieldstats.FieldStatsResponse; diff --git a/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java b/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java index 1eb92f203da8a..ed160d92b32ce 100644 --- a/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java +++ b/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java @@ -29,7 +29,6 @@ import org.apache.lucene.store.SimpleFSDirectory; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; diff --git a/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java b/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java index c626dc1c96679..78d03746b9331 100644 --- a/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java +++ b/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java @@ -137,7 +137,7 @@ public ChannelPipelineFactory configureServerChannelPipelineFactory() { } @Override - public HttpServerTransport stop() throws ElasticsearchException { + public HttpServerTransport stop() { executorService.shutdownNow(); return super.stop(); } diff --git a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java index 3db8c5039b78d..78f2bd5077c6e 100644 --- a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.FailedToResolveConfigException; diff --git a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java index 1500377fc18f8..7b66c4f41e657 100644 --- a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.*; import org.apache.lucene.analysis.reverse.ReverseStringFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings.Builder; diff --git a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java index 0aceb27bc02e0..996471a205cfe 100644 --- a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.analysis; -import java.lang.IllegalArgumentException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.inject.Injector; diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java index 2e7e09f4ab9c8..2792f0c4150cf 100644 --- a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalysisService; diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java b/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java index b4f074498a3ca..1dd88a83a1e52 100644 --- a/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java +++ b/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.engine; import org.apache.lucene.index.LiveIndexWriterConfig; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; diff --git a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java b/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java index c8760ddd561e7..ffbe671580f9a 100644 --- a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java @@ -67,7 +67,7 @@ public TokenCountFieldMapperIntegrationTests(@Name("storeCountedFields") boolean * It is possible to get the token count in a search response. */ @Test - public void searchReturnsTokenCount() throws ElasticsearchException, IOException { + public void searchReturnsTokenCount() throws IOException { init(); assertSearchReturns(searchById("single"), "single"); @@ -82,7 +82,7 @@ public void searchReturnsTokenCount() throws ElasticsearchException, IOException * It is possible to search by token count. */ @Test - public void searchByTokenCount() throws ElasticsearchException, IOException { + public void searchByTokenCount() throws IOException { init(); assertSearchReturns(searchByNumericRange(4, 4).get(), "single"); @@ -96,7 +96,7 @@ public void searchByTokenCount() throws ElasticsearchException, IOException { * It is possible to search by token count. */ @Test - public void facetByTokenCount() throws ElasticsearchException, IOException { + public void facetByTokenCount() throws IOException { init(); String facetField = randomFrom(ImmutableList.of( @@ -109,7 +109,7 @@ public void facetByTokenCount() throws ElasticsearchException, IOException { assertThat(terms.getBuckets().size(), equalTo(9)); } - private void init() throws ElasticsearchException, IOException { + private void init() throws IOException { prepareCreate("test").addMapping("test", jsonBuilder().startObject() .startObject("test") .startObject("properties") diff --git a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index eda3d9fd9c84b..b4ecfeeb220a3 100644 --- a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.NumericRangeQuery; import org.apache.lucene.search.QueryWrapperFilter; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.LocaleUtils; @@ -433,4 +432,4 @@ public void testNumericResolution() throws Exception { .bytes()); assertThat(getDateAsMillis(doc.rootDoc(), "date_field"), equalTo(43000L)); } -} \ No newline at end of file +} diff --git a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java index f97bb8e7b80e3..8923d95f4052a 100644 --- a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.mapper.ip; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; diff --git a/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java index 41c98311b8eb8..00cca381db273 100644 --- a/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java +++ b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java @@ -22,7 +22,6 @@ import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index 03ed89f4c792a..d37e5cf31c058 100644 --- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java +++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -64,7 +64,6 @@ import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.termvectors.MultiTermVectorsItemResponse; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; @@ -2441,7 +2440,7 @@ public void testProperErrorMessagesForMisplacedWeightsAndFunctions() throws IOEx } // https://github.com/elasticsearch/elasticsearch/issues/6722 - public void testEmptyBoolSubClausesIsMatchAll() throws ElasticsearchException, IOException { + public void testEmptyBoolSubClausesIsMatchAll() throws IOException { String query = copyToStringFromClasspath("/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json"); IndexService indexService = createIndex("testidx", client().admin().indices().prepareCreate("testidx") .addMapping("foo") diff --git a/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java b/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java index ad5b2b1d38928..27d8641789a4c 100644 --- a/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java +++ b/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.search.child; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 42761ca7a04ed..e17721a0f00f2 100644 --- a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -18,8 +18,6 @@ */ package org.elasticsearch.index.shard; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.ShardRouting; diff --git a/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java index eed8769475df3..ccf87f2efef25 100644 --- a/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java +++ b/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.index.shard; -import java.lang.IllegalStateException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java index c0dd7d1b834f1..4c422448ede99 100644 --- a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java +++ b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indices; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequestBuilder; diff --git a/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java b/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java index 67ca29e9461d6..415d806278f32 100644 --- a/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java +++ b/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices; import org.apache.lucene.store.LockObtainFailedException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java index f65aeb64b2c88..bf169d254e6a4 100644 --- a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.analyze; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; @@ -73,7 +72,7 @@ public void simpleAnalyzerTests() throws Exception { } @Test - public void analyzeNumericField() throws ElasticsearchException, IOException { + public void analyzeNumericField() throws IOException { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).addMapping("test", "long", "type=long", "double", "type=double")); ensureGreen("test"); diff --git a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java b/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java index 6b42cbad84b5a..cc8e7c5fae8e3 100644 --- a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java +++ b/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indices.recovery; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index 8653c16da3e76..a12e35a92eeb0 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.settings; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 263a33940443f..fad19ed7b2817 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -23,7 +23,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; diff --git a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java index a4794649c8fb4..b2308b15a8cd5 100644 --- a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java +++ b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indices.state; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java index 1d120ca9f7c80..ce96576ce15f3 100644 --- a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java @@ -20,7 +20,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionRequestValidationException; diff --git a/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java b/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java index 37fe6aa04febb..21fa628f2a8bd 100644 --- a/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java +++ b/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java @@ -23,7 +23,6 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.info.PluginInfo; diff --git a/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java b/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java index e8501c40d1f90..dc58961cc4bd6 100644 --- a/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java +++ b/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java @@ -445,7 +445,7 @@ public ThreadPool threadPool() { } @Override - public void close() throws ElasticsearchException { + public void close() { } diff --git a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java index ef774983872da..9b2b11fddad05 100644 --- a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.routing; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Priority; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java index 7041be12e36c6..b2acd54a373e9 100644 --- a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java +++ b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableSet; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java b/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java index ec28c3b90b04f..b96391682fe78 100644 --- a/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.script; import com.google.common.collect.Lists; -import java.lang.IllegalArgumentException; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/script/ScriptModesTests.java b/src/test/java/org/elasticsearch/script/ScriptModesTests.java index 96cc6fda02e87..f0051d188bb3b 100644 --- a/src/test/java/org/elasticsearch/script/ScriptModesTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptModesTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.script; import com.google.common.collect.*; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.script.ScriptService.ScriptType; diff --git a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java index 0be2f2a80b533..69aa868583552 100644 --- a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import java.lang.IllegalArgumentException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.ImmutableSettings; diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java index e4b226db3f02d..16ce8a964dc79 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java +++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.bucket.significant; import org.apache.lucene.util.BytesRef; -import java.lang.IllegalArgumentException; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.InputStreamStreamInput; diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index d2f2a90544009..c8cc0921beebf 100644 --- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -20,7 +20,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -180,7 +179,7 @@ public void multiLevelChild() throws Exception { @Test // see #6722 - public void test6722() throws ElasticsearchException, IOException { + public void test6722() throws IOException { assertAcked(prepareCreate("test") .addMapping("foo") .addMapping("test", "_parent", "type=foo")); @@ -199,7 +198,7 @@ public void test6722() throws ElasticsearchException, IOException { @Test // see #2744 - public void test2744() throws ElasticsearchException, IOException { + public void test2744() throws IOException { assertAcked(prepareCreate("test") .addMapping("foo") .addMapping("test", "_parent", "type=foo")); @@ -1341,7 +1340,7 @@ public void testParentFieldFilter() throws Exception { } @Test - public void testHasChildNotBeingCached() throws ElasticsearchException, IOException { + public void testHasChildNotBeingCached() throws IOException { assertAcked(prepareCreate("test") .addMapping("parent") .addMapping("child", "_parent", "type=parent")); @@ -1457,7 +1456,7 @@ public void testHasChildQueryOnlyReturnsSingleChildType() { } @Test - public void indexChildDocWithNoParentMapping() throws ElasticsearchException, IOException { + public void indexChildDocWithNoParentMapping() throws IOException { assertAcked(prepareCreate("test") .addMapping("parent") .addMapping("child1")); @@ -1481,7 +1480,7 @@ public void indexChildDocWithNoParentMapping() throws ElasticsearchException, IO } @Test - public void testAddingParentToExistingMapping() throws ElasticsearchException, IOException { + public void testAddingParentToExistingMapping() throws IOException { createIndex("test"); ensureGreen(); diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index 50e693c2c3e2a..bd6052289c65b 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.functionscore; -import java.lang.IllegalArgumentException; -import java.lang.IllegalStateException; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; diff --git a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java index 9de55b2a304c4..b67a5c0749459 100644 --- a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java @@ -98,7 +98,7 @@ public class HighlighterSearchTests extends ElasticsearchIntegrationTest { @Test // see #3486 - public void testHighTermFrequencyDoc() throws ElasticsearchException, IOException { + public void testHighTermFrequencyDoc() throws IOException { assertAcked(prepareCreate("test") .addMapping("test", "name", "type=string,term_vector=with_positions_offsets,store=" + (randomBoolean() ? "yes" : "no"))); ensureYellow(); @@ -115,7 +115,7 @@ public void testHighTermFrequencyDoc() throws ElasticsearchException, IOExceptio } @Test - public void testNgramHighlightingWithBrokenPositions() throws ElasticsearchException, IOException { + public void testNgramHighlightingWithBrokenPositions() throws IOException { assertAcked(prepareCreate("test") .addMapping("test", jsonBuilder() .startObject() @@ -171,7 +171,7 @@ public void testNgramHighlightingWithBrokenPositions() throws ElasticsearchExcep } @Test - public void testMultiPhraseCutoff() throws ElasticsearchException, IOException { + public void testMultiPhraseCutoff() throws IOException { /* * MultiPhraseQuery can literally kill an entire node if there are too many terms in the * query. We cut off and extract terms if there are more than 16 terms in the query @@ -203,7 +203,7 @@ public void testMultiPhraseCutoff() throws ElasticsearchException, IOException { } @Test - public void testNgramHighlightingPreLucene42() throws ElasticsearchException, IOException { + public void testNgramHighlightingPreLucene42() throws IOException { assertAcked(prepareCreate("test") .addMapping("test", @@ -271,7 +271,7 @@ public void testNgramHighlightingPreLucene42() throws ElasticsearchException, IO } @Test - public void testNgramHighlighting() throws ElasticsearchException, IOException { + public void testNgramHighlighting() throws IOException { assertAcked(prepareCreate("test") .addMapping("test", "name", "type=string,analyzer=name_index_analyzer,search_analyzer=name_search_analyzer,term_vector=with_positions_offsets", @@ -1301,7 +1301,7 @@ public void testBoostingQuery() { } @Test - public void testBoostingQueryTermVector() throws ElasticsearchException, IOException { + public void testBoostingQueryTermVector() throws IOException { assertAcked(prepareCreate("test").addMapping("type1", type1TermVectorMapping())); ensureGreen(); client().prepareIndex("test", "type1").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog") @@ -1338,7 +1338,7 @@ public void testCommonTermsQuery() { } @Test - public void testCommonTermsTermVector() throws ElasticsearchException, IOException { + public void testCommonTermsTermVector() throws IOException { assertAcked(prepareCreate("test").addMapping("type1", type1TermVectorMapping())); ensureGreen(); @@ -1354,7 +1354,7 @@ public void testCommonTermsTermVector() throws ElasticsearchException, IOExcepti } @Test - public void testPhrasePrefix() throws ElasticsearchException, IOException { + public void testPhrasePrefix() throws IOException { Builder builder = settingsBuilder() .put(indexSettings()) .put("index.analysis.analyzer.synonym.tokenizer", "whitespace") @@ -2289,7 +2289,7 @@ public void testPostingsHighlighterShouldFailIfNoOffsets() throws Exception { } @Test - public void testPostingsHighlighterBoostingQuery() throws ElasticsearchException, IOException { + public void testPostingsHighlighterBoostingQuery() throws IOException { assertAcked(prepareCreate("test").addMapping("type1", type1PostingsffsetsMapping())); ensureGreen(); client().prepareIndex("test", "type1").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") @@ -2306,7 +2306,7 @@ public void testPostingsHighlighterBoostingQuery() throws ElasticsearchException } @Test - public void testPostingsHighlighterCommonTermsQuery() throws ElasticsearchException, IOException { + public void testPostingsHighlighterCommonTermsQuery() throws IOException { assertAcked(prepareCreate("test").addMapping("type1", type1PostingsffsetsMapping())); ensureGreen(); diff --git a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java index c1d8e32c51766..85e20e7fcbc2f 100644 --- a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java +++ b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.preference; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; diff --git a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java index 9d3b887fd196d..6a575fc38c749 100644 --- a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java +++ b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java @@ -1460,7 +1460,7 @@ public void testEmptyTopLevelFilter() { } @Test // see #2926 - public void testMustNot() throws ElasticsearchException, IOException, ExecutionException, InterruptedException { + public void testMustNot() throws IOException, ExecutionException, InterruptedException { assertAcked(prepareCreate("test") //issue manifested only with shards>=2 .setSettings(SETTING_NUMBER_OF_SHARDS, between(2, DEFAULT_MAX_NUM_SHARDS))); @@ -1483,7 +1483,7 @@ public void testMustNot() throws ElasticsearchException, IOException, ExecutionE } @Test // see #2994 - public void testSimpleSpan() throws ElasticsearchException, IOException, ExecutionException, InterruptedException { + public void testSimpleSpan() throws IOException, ExecutionException, InterruptedException { createIndex("test"); ensureGreen(); @@ -1505,7 +1505,7 @@ public void testSimpleSpan() throws ElasticsearchException, IOException, Executi } @Test - public void testSpanMultiTermQuery() throws ElasticsearchException, IOException { + public void testSpanMultiTermQuery() throws IOException { createIndex("test"); ensureGreen(); @@ -1538,7 +1538,7 @@ public void testSpanMultiTermQuery() throws ElasticsearchException, IOException } @Test - public void testSpanNot() throws ElasticsearchException, IOException, ExecutionException, InterruptedException { + public void testSpanNot() throws IOException, ExecutionException, InterruptedException { createIndex("test"); ensureGreen(); @@ -1577,7 +1577,7 @@ public void testSpanNot() throws ElasticsearchException, IOException, ExecutionE } @Test - public void testSimpleDFSQuery() throws ElasticsearchException, IOException { + public void testSimpleDFSQuery() throws IOException { assertAcked(prepareCreate("test") .addMapping("s", jsonBuilder() .startObject() diff --git a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java index f16a6d2907c4b..21dd1f3a1f892 100644 --- a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java +++ b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.scroll; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.search.*; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Priority; diff --git a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java index 5911985cc26b5..f95a1422786ec 100644 --- a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java +++ b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.simple; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java index 7972df64741f6..457c927822267 100644 --- a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java @@ -214,7 +214,7 @@ public void testTrackScores() throws Exception { } } - public void testRandomSorting() throws ElasticsearchException, IOException, InterruptedException, ExecutionException { + public void testRandomSorting() throws IOException, InterruptedException, ExecutionException { Random random = getRandom(); assertAcked(prepareCreate("test") .addMapping("type", @@ -1023,7 +1023,7 @@ public void testSortMissingNumbers() throws Exception { } @Test @Slow - public void testSortMissingStrings() throws ElasticsearchException, IOException { + public void testSortMissingStrings() throws IOException { assertAcked(prepareCreate("test").addMapping("type1", XContentFactory.jsonBuilder() .startObject() @@ -1458,7 +1458,7 @@ public void testSortMVField() throws Exception { } @Test - public void testSortOnRareField() throws ElasticsearchException, IOException { + public void testSortOnRareField() throws IOException { assertAcked(prepareCreate("test") .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties") .startObject("string_values").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject() @@ -1626,7 +1626,7 @@ public void testSortMetaField() throws Exception { * Test case for issue 6150: https://github.com/elasticsearch/elasticsearch/issues/6150 */ @Test - public void testNestedSort() throws ElasticsearchException, IOException, InterruptedException, ExecutionException { + public void testNestedSort() throws IOException, InterruptedException, ExecutionException { assertAcked(prepareCreate("test") .addMapping("type", XContentFactory.jsonBuilder() diff --git a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java index 336903e67f170..a1f95a229cd2a 100644 --- a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java @@ -20,7 +20,6 @@ import com.google.common.collect.Sets; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.suggest.SuggestRequest; import org.elasticsearch.action.suggest.SuggestRequestBuilder; diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java index 47802e9d848a8..86d979df31c47 100644 --- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.*; @@ -410,7 +409,7 @@ public void testSizeAndSort() throws Exception { } @Test // see #2817 - public void testStopwordsOnlyPhraseSuggest() throws ElasticsearchException, IOException { + public void testStopwordsOnlyPhraseSuggest() throws IOException { assertAcked(prepareCreate("test").addMapping("typ1", "body", "type=string,analyzer=stopwd").setSettings( settingsBuilder() .put("index.analysis.analyzer.stopwd.tokenizer", "whitespace") @@ -428,7 +427,7 @@ public void testStopwordsOnlyPhraseSuggest() throws ElasticsearchException, IOEx } @Test - public void testPrefixLength() throws ElasticsearchException, IOException { // Stopped here + public void testPrefixLength() throws IOException { // Stopped here CreateIndexRequestBuilder builder = prepareCreate("test").setSettings(settingsBuilder() .put(SETTING_NUMBER_OF_SHARDS, 1) .put("index.analysis.analyzer.reverse.tokenizer", "standard") @@ -473,7 +472,7 @@ public void testPrefixLength() throws ElasticsearchException, IOException { // @Test @Slow @Nightly - public void testMarvelHerosPhraseSuggest() throws ElasticsearchException, IOException { + public void testMarvelHerosPhraseSuggest() throws IOException { CreateIndexRequestBuilder builder = prepareCreate("test").setSettings(settingsBuilder() .put(indexSettings()) .put("index.analysis.analyzer.reverse.tokenizer", "standard") @@ -669,7 +668,7 @@ public void testSizePararm() throws IOException { @Test @Nightly - public void testPhraseBoundaryCases() throws ElasticsearchException, IOException { + public void testPhraseBoundaryCases() throws IOException { CreateIndexRequestBuilder builder = prepareCreate("test").setSettings(settingsBuilder() .put(indexSettings()).put(SETTING_NUMBER_OF_SHARDS, 1) // to get reliable statistics we should put this all into one shard .put("index.analysis.analyzer.body.tokenizer", "standard") @@ -876,7 +875,7 @@ public void testEmptyShards() throws IOException, InterruptedException { * score during the reduce phase. Failures don't occur every time - maybe two out of five tries but we don't repeat it to save time. */ @Test - public void testSearchForRarePhrase() throws ElasticsearchException, IOException { + public void testSearchForRarePhrase() throws IOException { // If there isn't enough chaf per shard then shards can become unbalanced, making the cutoff recheck this is testing do more harm then good. int chafPerShard = 100; diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java index a3abd47e91368..0ca85672ec98a 100644 --- a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java +++ b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java @@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase.Slow; -import java.lang.IllegalArgumentException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ListenableActionFuture; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java index fe2eb17f6549e..af3fc057d29bb 100644 --- a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java +++ b/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java @@ -123,7 +123,7 @@ private void addFailure() { } @Override - protected void doStop() throws ElasticsearchException { + protected void doStop() { unblock(); super.doStop(); } diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java index 9777b57e3bf68..5d2d00c4870ca 100644 --- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java +++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java @@ -38,7 +38,6 @@ import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; diff --git a/src/test/java/org/elasticsearch/test/TestCluster.java b/src/test/java/org/elasticsearch/test/TestCluster.java index e6b5967f2c95f..c8d48521b14ac 100644 --- a/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/src/test/java/org/elasticsearch/test/TestCluster.java @@ -20,7 +20,6 @@ package org.elasticsearch.test; import com.carrotsearch.hppc.ObjectArrayList; -import java.lang.IllegalArgumentException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; diff --git a/src/test/java/org/elasticsearch/test/TestSearchContext.java b/src/test/java/org/elasticsearch/test/TestSearchContext.java index 77448544b1ceb..e1ccd52554622 100644 --- a/src/test/java/org/elasticsearch/test/TestSearchContext.java +++ b/src/test/java/org/elasticsearch/test/TestSearchContext.java @@ -590,7 +590,7 @@ public MapperService.SmartNameObjectMapper smartNameObjectMapper(String name) { } @Override - public void doClose() throws ElasticsearchException { + public void doClose() { } @Override diff --git a/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java b/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java index b7c2d07d4d26e..6613a78644905 100644 --- a/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java +++ b/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java @@ -78,7 +78,7 @@ private V wrap(final V v) { return new V() { @Override - public void close() throws ElasticsearchException { + public void close() { final Throwable t = ACQUIRED_PAGES.remove(v); if (t == null) { throw new IllegalStateException("Releasing a page that has not been acquired"); diff --git a/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java b/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java index 5c60459285309..18f712e725924 100644 --- a/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java +++ b/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java @@ -19,7 +19,6 @@ package org.elasticsearch.test.cluster; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlock; @@ -152,17 +151,17 @@ public void removeLifecycleListener(LifecycleListener listener) { } @Override - public ClusterService start() throws ElasticsearchException { + public ClusterService start() { return null; } @Override - public ClusterService stop() throws ElasticsearchException { + public ClusterService stop() { return null; } @Override - public void close() throws ElasticsearchException { + public void close() { } -} \ No newline at end of file +} diff --git a/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java b/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java index 22e6f2eecdf0b..6a61665e355a4 100644 --- a/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java +++ b/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java @@ -19,7 +19,6 @@ package org.elasticsearch.test.cluster; import org.elasticsearch.ElasticsearchException; -import java.lang.IllegalStateException; import org.elasticsearch.Version; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlock; @@ -209,17 +208,17 @@ public void removeLifecycleListener(LifecycleListener listener) { } @Override - public ClusterService start() throws ElasticsearchException { + public ClusterService start() { throw new UnsupportedOperationException(); } @Override - public ClusterService stop() throws ElasticsearchException { + public ClusterService stop() { throw new UnsupportedOperationException(); } @Override - public void close() throws ElasticsearchException { + public void close() { throw new UnsupportedOperationException(); } diff --git a/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java b/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java index d73f501a3ab2e..4d74b049612f0 100644 --- a/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java +++ b/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java @@ -41,6 +41,6 @@ public MergePolicy getMergePolicy() { } @Override - public void close() throws ElasticsearchException {} + public void close() {} } diff --git a/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java b/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java index ca4c795034528..8cb1f620c3aad 100644 --- a/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java +++ b/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java @@ -164,17 +164,17 @@ public void removeLifecycleListener(LifecycleListener listener) { } @Override - public Transport start() throws ElasticsearchException { + public Transport start() { return null; } @Override - public Transport stop() throws ElasticsearchException { + public Transport stop() { return null; } @Override - public void close() throws ElasticsearchException { + public void close() { } } diff --git a/src/test/java/org/elasticsearch/test/transport/MockTransportService.java b/src/test/java/org/elasticsearch/test/transport/MockTransportService.java index d7cc1ed1ca1ed..5e8b135a61c6b 100644 --- a/src/test/java/org/elasticsearch/test/transport/MockTransportService.java +++ b/src/test/java/org/elasticsearch/test/transport/MockTransportService.java @@ -387,19 +387,19 @@ public void removeLifecycleListener(LifecycleListener listener) { } @Override - public Transport start() throws ElasticsearchException { + public Transport start() { transport.start(); return this; } @Override - public Transport stop() throws ElasticsearchException { + public Transport stop() { transport.stop(); return this; } @Override - public void close() throws ElasticsearchException { + public void close() { transport.close(); } diff --git a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java index ee845d2199c8a..1f5e5f9c9ee06 100644 --- a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java +++ b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport.netty; -import java.lang.IllegalStateException; import org.elasticsearch.common.util.concurrent.KeyedLock; import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; diff --git a/src/test/java/org/elasticsearch/update/UpdateNoopTests.java b/src/test/java/org/elasticsearch/update/UpdateNoopTests.java index ab428aab75f3e..e5c1ee9625e53 100644 --- a/src/test/java/org/elasticsearch/update/UpdateNoopTests.java +++ b/src/test/java/org/elasticsearch/update/UpdateNoopTests.java @@ -197,7 +197,7 @@ public void totallyEmpty() throws Exception { update(false, 2, XContentFactory.jsonBuilder().startObject().endObject()); } - private XContentBuilder fields(Object... fields) throws ElasticsearchException, IOException { + private XContentBuilder fields(Object... fields) throws IOException { assertEquals("Fields must field1, value1, field2, value2, etc", 0, fields.length % 2); XContentBuilder builder = XContentFactory.jsonBuilder().startObject();