You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/08/15 20:04:24 UTC
svn commit: r1696080 - in /lucene/dev/trunk/lucene:
analysis/common/src/java/org/apache/lucene/analysis/hunspell/
classification/src/test/org/apache/lucene/classification/utils/
queryparser/src/java/org/apache/lucene/queryparser/surround/query/ querypa...
Author: uschindler
Date: Sat Aug 15 18:04:24 2015
New Revision: 1696080
URL: http://svn.apache.org/r1696080
Log:
LUCENE-6740: Reduce warnings emitted by javac #6
Modified:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java
lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java
lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java Sat Aug 15 18:04:24 2015
@@ -266,11 +266,11 @@ final class Stemmer {
// some state for traversing FSTs
final FST.BytesReader prefixReaders[] = new FST.BytesReader[3];
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
final FST.Arc<IntsRef> prefixArcs[] = new FST.Arc[3];
final FST.BytesReader suffixReaders[] = new FST.BytesReader[3];
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
final FST.Arc<IntsRef> suffixArcs[] = new FST.Arc[3];
Modified: lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java (original)
+++ lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java Sat Aug 15 18:04:24 2015
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* Tests for {@link ConfusionMatrixGenerator}
*/
-public class ConfusionMatrixGeneratorTest extends ClassificationTestBase {
+public class ConfusionMatrixGeneratorTest extends ClassificationTestBase<Object> {
@Test
public void testGetConfusionMatrixWithSNB() throws Exception {
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java Sat Aug 15 18:04:24 2015
@@ -40,9 +40,9 @@ public class OrQuery extends ComposedQue
@Override
public String distanceSubQueryNotAllowed() {
- Iterator sqi = getSubQueriesIterator();
+ Iterator<SrndQuery> sqi = getSubQueriesIterator();
while (sqi.hasNext()) {
- SrndQuery leq = (SrndQuery) sqi.next();
+ SrndQuery leq = sqi.next();
if (leq instanceof DistanceSubQuery) {
String m = ((DistanceSubQuery)leq).distanceSubQueryNotAllowed();
if (m != null) {
@@ -57,9 +57,10 @@ public class OrQuery extends ComposedQue
@Override
public void addSpanQueries(SpanNearClauseFactory sncf) throws IOException {
- Iterator sqi = getSubQueriesIterator();
+ Iterator<SrndQuery> sqi = getSubQueriesIterator();
while (sqi.hasNext()) {
- ((DistanceSubQuery)sqi.next()).addSpanQueries(sncf);
+ SrndQuery s = sqi.next();
+ ((DistanceSubQuery) s).addSpanQueries(sncf);
}
}
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java Sat Aug 15 18:04:24 2015
@@ -61,7 +61,7 @@ abstract class RewriteQuery<SQ extends S
return false;
if (! getClass().equals(obj.getClass()))
return false;
- RewriteQuery other = (RewriteQuery)obj;
+ @SuppressWarnings("unchecked") RewriteQuery<SQ> other = (RewriteQuery<SQ>)obj;
return super.equals(obj)
&& fieldName.equals(other.fieldName)
&& qf.equals(other.qf)
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java Sat Aug 15 18:04:24 2015
@@ -176,9 +176,9 @@ public class QueryTemplateManager {
Element root = doc.createElement("Document");
doc.appendChild(root);
- Enumeration keysEnum = formProperties.keys();
+ Enumeration<?> keysEnum = formProperties.propertyNames();
while (keysEnum.hasMoreElements()) {
- String propName = (String) keysEnum.nextElement();
+ String propName = keysEnum.nextElement().toString();
String value = formProperties.getProperty(propName);
if ((value != null) && (value.length() > 0)) {
DOMUtils.insertChild(root, propName, value);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java?rev=1696080&r1=1696079&r2=1696080&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java Sat Aug 15 18:04:24 2015
@@ -156,14 +156,13 @@ public class TestQueryParser extends Que
@SuppressWarnings("rawtype")
public void testProtectedCtors() throws Exception {
try {
- QueryParser.class.getConstructor(new Class[] {CharStream.class});
+ QueryParser.class.getConstructor(CharStream.class);
fail("please switch public QueryParser(CharStream) to be protected");
} catch (NoSuchMethodException nsme) {
// expected
}
try {
- QueryParser.class
- .getConstructor(new Class[] {QueryParserTokenManager.class});
+ QueryParser.class.getConstructor(QueryParserTokenManager.class);
fail("please switch public QueryParser(QueryParserTokenManager) to be protected");
} catch (NoSuchMethodException nsme) {
// expected