From 9a29705c49b4090f6bed3ef5156a7d1fede4fc1b Mon Sep 17 00:00:00 2001 From: Sebastian Monte Date: Mon, 23 Feb 2015 15:39:57 +0200 Subject: [PATCH] Fix errors reported by error-prone I compiled elasticsearch with error-prone (https://github.com/google/error-prone). This commit fixes the 13 errors reported by the tool. --- .../common/compress/Compressor.java | 1 + .../common/io/UTF8StreamWriter.java | 1 + .../discovery/zen/ZenDiscovery.java | 2 +- .../index/analysis/KeepWordFilterFactory.java | 2 +- .../analysis/LengthTokenFilterFactory.java | 2 +- .../analysis/TrimTokenFilterFactory.java | 2 +- .../analysis/PreBuiltTokenFilters.java | 10 +++--- .../recovery/RecoverySourceHandler.java | 2 +- .../elasticsearch/script/ScriptService.java | 3 +- .../cluster/metadata/MetaDataTests.java | 35 +++++++------------ .../common/geo/ShapeBuilderTests.java | 2 +- .../index/query/TemplateQueryTest.java | 2 +- .../search/geo/GeoPointParsingTests.java | 8 ++--- 13 files changed, 31 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/elasticsearch/common/compress/Compressor.java b/src/main/java/org/elasticsearch/common/compress/Compressor.java index 3f3ba4b4a03..8d0199703ac 100644 --- a/src/main/java/org/elasticsearch/common/compress/Compressor.java +++ b/src/main/java/org/elasticsearch/common/compress/Compressor.java @@ -61,5 +61,6 @@ public interface Compressor { /** * @deprecated Used for backward comp. since we now use Lucene compressed codec. */ + @Deprecated CompressedIndexInput indexInput(IndexInput in) throws IOException; } diff --git a/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java b/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java index d62ae22bc96..59c95f67ea3 100644 --- a/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java +++ b/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java @@ -332,6 +332,7 @@ public final class UTF8StreamWriter extends Writer { /** * @deprecated Replaced by {@link #setOutput(OutputStream)} */ + @Deprecated public UTF8StreamWriter setOutputStream(OutputStream out) { return this.setOutput(out); } diff --git a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index d91c7a2f127..b9279d7e832 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -173,7 +173,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen 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 [" + this.SETTING_JOIN_RETRY_ATTEMPTS + "]"); + throw new ElasticsearchIllegalArgumentException("'" + 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 + "]"); diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java index deae792a912..e2605d8ea23 100644 --- a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java @@ -93,7 +93,7 @@ public class KeepWordFilterFactory extends AbstractTokenFilterFactory { if (version.onOrAfter(Version.LUCENE_4_4)) { return new KeepWordFilter(tokenStream, keepWords); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43KeepWordFilter(enablePositionIncrements, tokenStream, keepWords); return filter; } diff --git a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java index cf660cadb2e..aa9868a4fef 100644 --- a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java @@ -57,7 +57,7 @@ public class LengthTokenFilterFactory extends AbstractTokenFilterFactory { if (version.onOrAfter(Version.LUCENE_4_4)) { return new LengthFilter(tokenStream, min, max); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43LengthFilter(enablePositionIncrements, tokenStream, min, max); return filter; } diff --git a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java index 6102aff4bed..a3d0d4b0fb5 100644 --- a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java +++ b/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java @@ -55,7 +55,7 @@ public class TrimTokenFilterFactory extends AbstractTokenFilterFactory { if (version.onOrAfter(Version.LUCENE_4_4_0)) { return new TrimFilter(tokenStream); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43TrimFilter(tokenStream, updateOffsets); return filter; } diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java b/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java index d31e151b43a..07a9688fbc4 100644 --- a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java +++ b/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java @@ -98,7 +98,7 @@ public enum PreBuiltTokenFilters { if (version.luceneVersion.onOrAfter(org.apache.lucene.util.Version.LUCENE_4_4_0)) { return new StopFilter(tokenStream, StopAnalyzer.ENGLISH_STOP_WORDS_SET); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43StopFilter(true, tokenStream, StopAnalyzer.ENGLISH_STOP_WORDS_SET); return filter; } @@ -111,7 +111,7 @@ public enum PreBuiltTokenFilters { if (version.luceneVersion.onOrAfter(org.apache.lucene.util.Version.LUCENE_4_4_0)) { return new TrimFilter(tokenStream); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43TrimFilter(tokenStream, true); return filter; } @@ -138,7 +138,7 @@ public enum PreBuiltTokenFilters { if (version.luceneVersion.onOrAfter(org.apache.lucene.util.Version.LUCENE_4_4_0)) { return new LengthFilter(tokenStream, 0, Integer.MAX_VALUE); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43LengthFilter(true, tokenStream, 0, Integer.MAX_VALUE); return filter; } @@ -200,7 +200,7 @@ public enum PreBuiltTokenFilters { if (version.luceneVersion.onOrAfter(org.apache.lucene.util.Version.LUCENE_4_4_0)) { return new NGramTokenFilter(tokenStream); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43NGramTokenFilter(tokenStream); return filter; } @@ -213,7 +213,7 @@ public enum PreBuiltTokenFilters { if (version.luceneVersion.onOrAfter(org.apache.lucene.util.Version.LUCENE_4_4_0)) { return new EdgeNGramTokenFilter(tokenStream, EdgeNGramTokenFilter.DEFAULT_MIN_GRAM_SIZE, EdgeNGramTokenFilter.DEFAULT_MAX_GRAM_SIZE); } else { - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") final TokenStream filter = new Lucene43EdgeNGramTokenFilter(tokenStream, EdgeNGramTokenFilter.DEFAULT_MIN_GRAM_SIZE, EdgeNGramTokenFilter.DEFAULT_MAX_GRAM_SIZE); return filter; } diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 87c75b4e91f..37115329a0b 100644 --- a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -235,7 +235,7 @@ public class RecoverySourceHandler implements Engine.RecoveryHandler { // recovered while ongoing large segment recoveries are // happening. It also allows these pools to be configured // separately. - if (fileSize > recoverySettings.SMALL_FILE_CUTOFF_BYTES) { + if (fileSize > RecoverySettings.SMALL_FILE_CUTOFF_BYTES) { pool = recoverySettings.concurrentStreamPool(); } else { pool = recoverySettings.concurrentSmallFileStreamPool(); diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java index 4f220282c52..3f01051c0dc 100644 --- a/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/src/main/java/org/elasticsearch/script/ScriptService.java @@ -160,8 +160,7 @@ public class ScriptService extends AbstractComponent implements Closeable { if (cacheExpire != null) { cacheBuilder.expireAfterAccess(cacheExpire.nanos(), TimeUnit.NANOSECONDS); } - cacheBuilder.removalListener(new ScriptCacheRemovalListener()); - this.cache = cacheBuilder.build(); + this.cache = cacheBuilder.removalListener(new ScriptCacheRemovalListener()).build(); ImmutableMap.Builder enginesByLangBuilder = ImmutableMap.builder(); ImmutableMap.Builder enginesByExtBuilder = ImmutableMap.builder(); diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java index a4429f949e9..e18dcdaedfc 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java @@ -581,74 +581,63 @@ public class MetaDataTests extends ElasticsearchTestCase { @Test public void testIsAllIndices_null() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(null), equalTo(true)); + assertThat(MetaData.isAllIndices(null), equalTo(true)); } @Test public void testIsAllIndices_empty() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(new String[0]), equalTo(true)); + assertThat(MetaData.isAllIndices(new String[0]), equalTo(true)); } @Test public void testIsAllIndices_explicitAll() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(new String[]{"_all"}), equalTo(true)); + assertThat(MetaData.isAllIndices(new String[]{"_all"}), equalTo(true)); } @Test public void testIsAllIndices_explicitAllPlusOther() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(new String[]{"_all", "other"}), equalTo(false)); + assertThat(MetaData.isAllIndices(new String[]{"_all", "other"}), equalTo(false)); } @Test public void testIsAllIndices_normalIndexes() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(new String[]{"index1", "index2", "index3"}), equalTo(false)); + assertThat(MetaData.isAllIndices(new String[]{"index1", "index2", "index3"}), equalTo(false)); } @Test public void testIsAllIndices_wildcard() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isAllIndices(new String[]{"*"}), equalTo(false)); + assertThat(MetaData.isAllIndices(new String[]{"*"}), equalTo(false)); } @Test public void testIsExplicitAllIndices_null() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(null), equalTo(false)); + assertThat(MetaData.isExplicitAllPattern(null), equalTo(false)); } @Test public void testIsExplicitAllIndices_empty() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(new String[0]), equalTo(false)); + assertThat(MetaData.isExplicitAllPattern(new String[0]), equalTo(false)); } @Test public void testIsExplicitAllIndices_explicitAll() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(new String[]{"_all"}), equalTo(true)); + assertThat(MetaData.isExplicitAllPattern(new String[]{"_all"}), equalTo(true)); } @Test public void testIsExplicitAllIndices_explicitAllPlusOther() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(new String[]{"_all", "other"}), equalTo(false)); + assertThat(MetaData.isExplicitAllPattern(new String[]{"_all", "other"}), equalTo(false)); } @Test public void testIsExplicitAllIndices_normalIndexes() throws Exception { - MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(new String[]{"index1", "index2", "index3"}), equalTo(false)); + assertThat(MetaData.isExplicitAllPattern(new String[]{"index1", "index2", "index3"}), equalTo(false)); } @Test public void testIsExplicitAllIndices_wildcard() throws Exception { MetaData metaData = MetaData.builder().build(); - assertThat(metaData.isExplicitAllPattern(new String[]{"*"}), equalTo(false)); + assertThat(MetaData.isExplicitAllPattern(new String[]{"*"}), equalTo(false)); } @Test diff --git a/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java index cb9c53846f2..5114d99d597 100644 --- a/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java +++ b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java @@ -185,7 +185,7 @@ public class ShapeBuilderTests extends ElasticsearchTestCase { .point(40.0, -50.0) .close().build(); fail("Polygon self-intersection"); - } catch (Throwable e) {} + } catch (Exception e) {} } diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java index 4a66b61fe44..aed0d1854a5 100644 --- a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java +++ b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java @@ -186,7 +186,7 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest { searchRequest.templateSource(bytesRef, false); client().search(searchRequest).get(); fail("expected exception"); - } catch (Throwable ex) { + } catch (Exception ex) { // expected - no params } String query = "{ \"template\" : { \"query\": {\"match_all\": {}}, \"size\" : \"{{my_size}}\" }, \"params\" : { \"my_size\": 1 } }"; diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java index c423419cb9f..92e4251c471 100644 --- a/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java @@ -93,7 +93,7 @@ public class GeoPointParsingTests extends ElasticsearchTestCase { try { GeoUtils.parseGeoPoint(parser); assertTrue(false); - } catch (Throwable e) {} + } catch (Exception e) {} } @Test @@ -109,7 +109,7 @@ public class GeoPointParsingTests extends ElasticsearchTestCase { try { GeoUtils.parseGeoPoint(parser); assertTrue(false); - } catch (Throwable e) {} + } catch (Exception e) {} } @Test @@ -125,7 +125,7 @@ public class GeoPointParsingTests extends ElasticsearchTestCase { try { GeoUtils.parseGeoPoint(parser); assertTrue(false); - } catch (Throwable e) {} + } catch (Exception e) {} } @Test @@ -141,7 +141,7 @@ public class GeoPointParsingTests extends ElasticsearchTestCase { try { GeoUtils.parseGeoPoint(parser); assertTrue(false); - } catch (Throwable e) {} + } catch (Exception e) {} } private static XContentParser objectLatLon(double lat, double lon) throws IOException {