You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/01/22 00:49:55 UTC
svn commit: r1653709 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/
lucene/benchmark/ lucene/benchmark/src...
Author: shalin
Date: Wed Jan 21 23:49:54 2015
New Revision: 1653709
URL: http://svn.apache.org/r1653709
Log:
LUCENE-6193: Collapse identical catch branches in try-catch statements
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
lucene/dev/branches/branch_5x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_5x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java
lucene/dev/branches/branch_5x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_5x/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Jan 21 23:49:54 2015
@@ -15,6 +15,11 @@ Optimizations
* LUCENE-6184: Make BooleanScorer only score windows that contain
matches. (Adrien Grand)
+Other
+
+* LUCENE-6193: Collapse identical catch branches in try-catch statements.
+ (shalin)
+
======================= Lucene 5.0.0 =======================
New Features
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java Wed Jan 21 23:49:54 2015
@@ -135,9 +135,7 @@ public class TestFactories extends BaseT
AbstractAnalysisFactory factory = null;
try {
factory = ctor.newInstance(args);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof IllegalArgumentException) {
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Wed Jan 21 23:49:54 2015
@@ -712,10 +712,8 @@ public class TestRandomChains extends Ba
} else {
Rethrow.rethrow(cause);
}
- } catch (IllegalAccessException iae) {
+ } catch (IllegalAccessException | InstantiationException iae) {
Rethrow.rethrow(iae);
- } catch (InstantiationException ie) {
- Rethrow.rethrow(ie);
}
return null; // no success
}
Modified: lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java Wed Jan 21 23:49:54 2015
@@ -58,9 +58,7 @@ public final class UIMAAnnotationsTokeni
protected void initializeIterator() throws IOException {
try {
analyzeInput();
- } catch (AnalysisEngineProcessException e) {
- throw new IOException(e);
- } catch (ResourceInitializationException e) {
+ } catch (AnalysisEngineProcessException | ResourceInitializationException e) {
throw new IOException(e);
}
finalOffset = correctOffset(cas.getDocumentText().length());
Modified: lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java Wed Jan 21 23:49:54 2015
@@ -70,9 +70,7 @@ public final class UIMATypeAwareAnnotati
protected void initializeIterator() throws IOException {
try {
analyzeInput();
- } catch (AnalysisEngineProcessException e) {
- throw new IOException(e);
- } catch (ResourceInitializationException e) {
+ } catch (AnalysisEngineProcessException | ResourceInitializationException e) {
throw new IOException(e);
}
featurePath = cas.createFeaturePath();
Modified: lucene/dev/branches/branch_5x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java Wed Jan 21 23:49:54 2015
@@ -202,10 +202,8 @@ public class EnwikiContentSource extends
}
}
}
- } catch (SAXException sae) {
+ } catch (SAXException | IOException sae) {
throw new RuntimeException(sae);
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
} finally {
synchronized(this) {
threadDone = true;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java Wed Jan 21 23:49:54 2015
@@ -170,9 +170,7 @@ abstract class ByteBufferIndexInput exte
this.curBufIndex = bi;
this.curBuf = b;
}
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- throw new EOFException("seek past EOF: " + this);
- } catch (IllegalArgumentException iae) {
+ } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException e) {
throw new EOFException("seek past EOF: " + this);
} catch (NullPointerException npe) {
throw new AlreadyClosedException("Already closed: " + this);
@@ -198,9 +196,7 @@ abstract class ByteBufferIndexInput exte
b.position((int) (pos & chunkSizeMask));
this.curBufIndex = bi;
this.curBuf = b;
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- throw new EOFException("seek past EOF: " + this);
- } catch (IllegalArgumentException iae) {
+ } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException aioobe) {
throw new EOFException("seek past EOF: " + this);
} catch (NullPointerException npe) {
throw new AlreadyClosedException("Already closed: " + this);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Wed Jan 21 23:49:54 2015
@@ -634,9 +634,7 @@ public class TestIndexWriterWithThreads
writerRef.get().prepareCommit();
}
writerRef.get().commit();
- } catch (AlreadyClosedException ace) {
- // ok
- } catch (NullPointerException npe) {
+ } catch (AlreadyClosedException | NullPointerException ace) {
// ok
} finally {
commitLock.unlock();
@@ -648,11 +646,7 @@ public class TestIndexWriterWithThreads
}
try {
writerRef.get().addDocument(docs.nextDoc());
- } catch (AlreadyClosedException ace) {
- // ok
- } catch (NullPointerException npe) {
- // ok
- } catch (AssertionError ae) {
+ } catch (AlreadyClosedException | NullPointerException | AssertionError ace) {
// ok
}
break;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java Wed Jan 21 23:49:54 2015
@@ -197,9 +197,7 @@ public class TestUnicodeUtil extends Luc
assertFalse(rc == -1);
assertEquals(cpString.substring(rs, rs + rc), str);
continue;
- } catch (IndexOutOfBoundsException e1) {
- // Ignored.
- } catch (IllegalArgumentException e2) {
+ } catch (IndexOutOfBoundsException | IllegalArgumentException e1) {
// Ignored.
}
assertTrue(rc == -1);
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java Wed Jan 21 23:49:54 2015
@@ -117,18 +117,12 @@ public abstract class QueryParserBase ex
Query res = TopLevelQuery(field);
return res!=null ? res : newBooleanQuery(false);
}
- catch (ParseException tme) {
+ catch (ParseException | TokenMgrError tme) {
// rethrow to include the original query:
ParseException e = new ParseException("Cannot parse '" +query+ "': " + tme.getMessage());
e.initCause(tme);
throw e;
- }
- catch (TokenMgrError tme) {
- ParseException e = new ParseException("Cannot parse '" +query+ "': " + tme.getMessage());
- e.initCause(tme);
- throw e;
- }
- catch (BooleanQuery.TooManyClauses tmc) {
+ } catch (BooleanQuery.TooManyClauses tmc) {
ParseException e = new ParseException("Cannot parse '" +query+ "': too many boolean clauses");
e.initCause(tmc);
throw e;
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java Wed Jan 21 23:49:54 2015
@@ -149,9 +149,7 @@ public class NLS {
try {
field.set(null, field.getName());
validateMessage(field.getName(), clazz);
- } catch (IllegalArgumentException e) {
- // should not happen
- } catch (IllegalAccessException e) {
+ } catch (IllegalArgumentException | IllegalAccessException e) {
// should not happen
}
}
Modified: lucene/dev/branches/branch_5x/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java Wed Jan 21 23:49:54 2015
@@ -419,9 +419,7 @@ public class IndexAndTaxonomyReplication
checker.setInfoStream(new PrintStream(bos, false, IOUtils.UTF_8), false);
try {
indexStatus = checker.checkIndex(null);
- } catch (IOException ioe) {
- // ok: we fallback below
- } catch (RuntimeException re) {
+ } catch (IOException | RuntimeException ioe) {
// ok: we fallback below
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java Wed Jan 21 23:49:54 2015
@@ -511,9 +511,7 @@ public abstract class BaseTermVectorsFor
try {
docsAndPositionsEnum.nextPosition();
fail();
- } catch (Exception e) {
- // ok
- } catch (AssertionError e) {
+ } catch (Exception | AssertionError e) {
// ok
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1653709&r1=1653708&r2=1653709&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Wed Jan 21 23:49:54 2015
@@ -689,10 +689,8 @@ public abstract class LuceneTestCase ext
m.setAccessible(true);
try {
m.invoke(IndexWriter.class, limit);
- } catch (IllegalAccessException iae) {
+ } catch (IllegalAccessException | InvocationTargetException iae) {
throw new RuntimeException(iae);
- } catch (InvocationTargetException ite) {
- throw new RuntimeException(ite);
}
}