You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2017/03/28 15:36:56 UTC
[1/4] lucene-solr:branch_6x: LUCENE-7754: Inner classes should be
static whenever possible.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 15a04fe4f -> 03e507814
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
----------------------------------------------------------------------
diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
index 5b2f0b8..2c20abd 100644
--- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
@@ -786,7 +786,7 @@ public class GetMavenDependenciesTask extends Task {
/**
* Stores information about an external dependency
*/
- private class ExternalDependency implements Comparable<ExternalDependency> {
+ private static class ExternalDependency implements Comparable<ExternalDependency> {
String groupId;
String artifactId;
boolean isTestDependency;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
----------------------------------------------------------------------
diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
index 3179c78..d7844b0 100644
--- a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
+++ b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
@@ -150,7 +150,7 @@ public class LibVersionsCheckTask extends Task {
*/
private Map<String,HashSet<String>> ignoreConflictVersions = new HashMap<>();
- private class Dependency {
+ private static class Dependency {
String org;
String name;
String directVersion;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
index 7545eac..d4418da 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
@@ -728,8 +728,8 @@ public class MailEntityProcessor extends EntityProcessorBase {
return true;
}
}
-
- class MailsSinceLastCheckFilter implements CustomFilter {
+
+ static class MailsSinceLastCheckFilter implements CustomFilter {
private Date since;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
index 51b5841..8fced58 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
@@ -167,7 +167,7 @@ public class VariableResolver {
return TemplateUpdateProcessorFactory.getVariables(expr, cache);
}
- class CurrentLevel {
+ static class CurrentLevel {
final Map<String,Object> map;
final int level;
CurrentLevel(int level, Map<String,Object> map) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
index b72f379..2ef5a91 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
@@ -73,7 +73,7 @@ public class AbstractDIHCacheTestCase {
//A limitation of this test class is that the primary key needs to be the first one in the list.
//DIHCaches, however, can handle any field being the primary key.
- class ControlData implements Comparable<ControlData>, Iterable<Object> {
+ static class ControlData implements Comparable<ControlData>, Iterable<Object> {
Object[] data;
ControlData(Object[] data) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
index 06b89c3..2774044 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
@@ -568,8 +568,8 @@ public abstract class AbstractSqlEntityProcessorTestCase extends
}
return changeSet.toArray(new String[changeSet.size()]);
}
-
- class IntChanges {
+
+ static class IntChanges {
public Integer[] changedKeys;
public Integer[] deletedKeys;
public Integer[] addedKeys;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 95af5f9..089a133 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -109,7 +109,7 @@ public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCa
fail("Commit should have occured but it did not");
}
- private class SolrInstance {
+ private static class SolrInstance {
String name;
Integer port;
File homeDir;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
index 27a30d1..92bd01f 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java
@@ -98,7 +98,7 @@ class XLSXWriter extends TextResponseWriter {
SolrQueryRequest req;
SolrQueryResponse rsp;
- class SerialWriteWorkbook {
+ static class SerialWriteWorkbook {
SXSSFWorkbook swb;
Sheet sh;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java
index 5bec4b3..1d5f667 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java
@@ -300,7 +300,7 @@ public class LTRScoringQuery extends Query {
return field;
}
- public class FeatureInfo {
+ public static class FeatureInfo {
final private String name;
private float value;
private boolean used;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
index 6c43afa..c927ba5 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
@@ -80,7 +80,7 @@ public class TestLTRReRankingPipeline extends LuceneTestCase {
return features;
}
- private class MockModel extends LTRScoringModel {
+ private static class MockModel extends LTRScoringModel {
public MockModel(String name, List<Feature> features,
List<Normalizer> norms,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
index e7cc9b7..133bc63 100644
--- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
@@ -376,7 +376,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar
}
// see: http://svn.apache.org/repos/asf/velocity/tools/branches/2.0.x/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
- private class SolrVelocityResourceTool extends ResourceTool {
+ private static class SolrVelocityResourceTool extends ResourceTool {
private ClassLoader solrClassLoader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index da51e12..5fd2ec1 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -430,7 +430,7 @@ public class Overseer implements Closeable {
}
- class OverseerThread extends Thread implements Closeable {
+ static class OverseerThread extends Thread implements Closeable {
protected volatile boolean isClosed;
private Closeable thread;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
index c7604d6..e031303 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
@@ -108,7 +108,7 @@ public class OverseerTaskQueue extends DistributedQueue {
/**
* Watcher that blocks until a WatchedEvent occurs for a znode.
*/
- private final class LatchWatcher implements Watcher {
+ private static final class LatchWatcher implements Watcher {
private final Object lock;
private WatchedEvent event;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 37d673c..c47cc2a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -238,7 +238,7 @@ public class ZkController {
}
// notifies registered listeners after the ZK reconnect in the background
- private class OnReconnectNotifyAsync implements Callable {
+ private static class OnReconnectNotifyAsync implements Callable {
private final OnReconnect listener;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
index 08a8a4e..e710063 100644
--- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
*
*/
public abstract class CachingDirectoryFactory extends DirectoryFactory {
- protected class CacheValue {
+ protected static class CacheValue {
final public String path;
final public Directory directory;
// for debug
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
index 75a787b..a151a43 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
@@ -207,7 +207,7 @@ public class CdcrReplicator implements Runnable {
/**
* Exception to catch update request issues with the target cluster.
*/
- public class CdcrReplicatorException extends Exception {
+ public static class CdcrReplicatorException extends Exception {
private final UpdateRequest req;
private final UpdateResponse rsp;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
index 2ca0d80..bf80608 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
@@ -197,7 +197,7 @@ class CdcrReplicatorState {
}
- class BenchmarkTimer {
+ static class BenchmarkTimer {
private long startTime;
private long runTime = 0;
@@ -266,7 +266,7 @@ class CdcrReplicatorState {
}
- private class ErrorQueueEntry {
+ private static class ErrorQueueEntry {
private ErrorType type;
private Date timestamp;
@@ -277,7 +277,7 @@ class CdcrReplicatorState {
}
}
- private class FixedQueue<E> extends LinkedList<E> {
+ private static class FixedQueue<E> extends LinkedList<E> {
private int maxSize;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
index 5acfa2f..4392c81 100644
--- a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
@@ -926,7 +926,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public int resetValue();
}
- class IntDesc implements IntComp {
+ static class IntDesc implements IntComp {
public int resetValue() {
return Integer.MIN_VALUE;
@@ -943,7 +943,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- class IntAsc implements IntComp {
+ static class IntAsc implements IntComp {
public int resetValue() {
return Integer.MAX_VALUE;
@@ -1005,7 +1005,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public long resetValue();
}
- class LongDesc implements LongComp {
+ static class LongDesc implements LongComp {
public long resetValue() {
return Long.MIN_VALUE;
@@ -1022,7 +1022,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- class LongAsc implements LongComp {
+ static class LongAsc implements LongComp {
public long resetValue() {
return Long.MAX_VALUE;
@@ -1084,7 +1084,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public float resetValue();
}
- public class FloatDesc implements FloatComp {
+ public static class FloatDesc implements FloatComp {
public float resetValue() {
return -Float.MAX_VALUE;
}
@@ -1100,7 +1100,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- public class FloatAsc implements FloatComp {
+ public static class FloatAsc implements FloatComp {
public float resetValue() {
return Float.MAX_VALUE;
}
@@ -1161,7 +1161,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public double resetValue();
}
- public class DoubleDesc implements DoubleComp {
+ public static class DoubleDesc implements DoubleComp {
public double resetValue() {
return -Double.MAX_VALUE;
}
@@ -1177,7 +1177,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- public class DoubleAsc implements DoubleComp {
+ public static class DoubleAsc implements DoubleComp {
public double resetValue() {
return Double.MAX_VALUE;
}
@@ -1645,7 +1645,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- public class IgnoreException extends IOException {
+ public static class IgnoreException extends IOException {
public void printStackTrace(PrintWriter pw) {
pw.print("Early Client Disconnect");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index 94a43ef..6c3da83 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -1649,7 +1649,7 @@ public class IndexFetcher {
}
}
- private class DirectoryFile implements FileInterface {
+ private static class DirectoryFile implements FileInterface {
private final String saveAs;
private Directory copy2Dir;
private IndexOutput outStream;
@@ -1684,7 +1684,7 @@ public class IndexFetcher {
}
}
- private class LocalFsFile implements FileInterface {
+ private static class LocalFsFile implements FileInterface {
private File copy2Dir;
FileChannel fileChannel;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
index 7563fe8..f307baa 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -141,7 +141,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware, Per
/*
* Only necessary for SolrJ JDBC driver since metadata has to be passed back
*/
- private class SqlHandlerStream extends JDBCStream {
+ private static class SqlHandlerStream extends JDBCStream {
private final boolean includeMetadata;
private boolean firstTuple = true;
List<String> metadataFields = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index 0d962d4..fb85d34 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -497,7 +497,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
rb.rsp.add("expanded", expanded);
}
- private class GroupExpandCollector implements Collector, GroupCollector {
+ private static class GroupExpandCollector implements Collector, GroupCollector {
private SortedDocValues docValues;
private MultiDocValues.OrdinalMap ordinalMap;
private SortedDocValues segmentValues;
@@ -579,7 +579,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
}
}
- private class NumericGroupExpandCollector implements Collector, GroupCollector {
+ private static class NumericGroupExpandCollector implements Collector, GroupCollector {
private NumericDocValues docValues;
private String field;
@@ -717,7 +717,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
}
}
- private class ReaderWrapper extends FilterLeafReader {
+ private static class ReaderWrapper extends FilterLeafReader {
private String field;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 0890a37..f0a28f0 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -326,7 +326,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
* If all nodes prefer local-cores then a bad/heavily-loaded node will receive less requests from healthy nodes.
* This will help prevent a distributed deadlock or timeouts in all the healthy nodes due to one bad node.
*/
- private class IsOnPreferredHostComparator implements Comparator<Object> {
+ private static class IsOnPreferredHostComparator implements Comparator<Object> {
final private String preferredHostAddress;
public IsOnPreferredHostComparator(String preferredHostAddress) {
this.preferredHostAddress = preferredHostAddress;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
index 6aae231..5c2b07f 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
@@ -301,7 +301,7 @@ public class PivotFacetFieldValueCollection implements Iterable<PivotFacetValue>
}
/** Sorts {@link PivotFacetValue} instances by their count */
- public class PivotFacetCountComparator implements Comparator<PivotFacetValue> {
+ public static class PivotFacetCountComparator implements Comparator<PivotFacetValue> {
public int compare(PivotFacetValue left, PivotFacetValue right) {
int countCmp = right.getCount() - left.getCount();
return (0 != countCmp) ? countCmp :
@@ -310,7 +310,7 @@ public class PivotFacetFieldValueCollection implements Iterable<PivotFacetValue>
}
/** Sorts {@link PivotFacetValue} instances by their value */
- public class PivotFacetValueComparator implements Comparator<PivotFacetValue> {
+ public static class PivotFacetValueComparator implements Comparator<PivotFacetValue> {
public int compare(PivotFacetValue left, PivotFacetValue right) {
return compareWithNullLast(left.getValue(), right.getValue());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
index b76537a..e00120c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
@@ -353,7 +353,7 @@ public class TermsComponent extends SearchComponent {
return sreq;
}
- public class TermsHelper {
+ public static class TermsHelper {
// map to store returned terms
private HashMap<String, HashMap<String, TermsResponse.Term>> fieldmap;
private SolrParams params;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
index 33ea575..c5a6d0a 100644
--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
@@ -750,7 +750,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
}
// Wraps FVH to allow pass-by-reference. Public access to allow use in 3rd party subclasses
- public class FvhContainer {
+ public static class FvhContainer {
FastVectorHighlighter fvh;
FieldQuery fieldQuery;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index b22feab..9bc888d 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@ -368,13 +368,13 @@ public final class ManagedIndexSchema extends IndexSchema {
}
- public class FieldExistsException extends SolrException {
+ public static class FieldExistsException extends SolrException {
public FieldExistsException(ErrorCode code, String msg) {
super(code, msg);
}
}
- public class SchemaChangedInZkException extends SolrException {
+ public static class SchemaChangedInZkException extends SolrException {
public SchemaChangedInZkException(ErrorCode code, String msg) {
super(code, msg);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
index 0ecb195..44bb420 100644
--- a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
+++ b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
@@ -160,7 +160,7 @@ public class RandomSortField extends FieldType {
- public class RandomValueSource extends ValueSource {
+ public static class RandomValueSource extends ValueSource {
private final String field;
public RandomValueSource(String field) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
index 22702dc..2a00a09 100644
--- a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
@@ -59,9 +59,9 @@ public class ComplexPhraseQParserPlugin extends QParserPlugin {
/**
* Modified from {@link org.apache.solr.search.LuceneQParser} and {@link org.apache.solr.search.SurroundQParserPlugin.SurroundQParser}
*/
- class ComplexPhraseQParser extends QParser {
+ static class ComplexPhraseQParser extends QParser {
- final class SolrQueryParserDelegate extends SolrQueryParser {
+ static final class SolrQueryParserDelegate extends SolrQueryParser {
private SolrQueryParserDelegate(QParser parser, String defaultField) {
super(parser, defaultField);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
index 8156f24..9dd883a 100644
--- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
@@ -121,7 +121,7 @@ public class ExportQParserPlugin extends QParserPlugin {
}
}
- private class ExportCollector extends TopDocsCollector {
+ private static class ExportCollector extends TopDocsCollector {
private FixedBitSet[] sets;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
index 173a72d..d68eb8a 100644
--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
@@ -957,7 +957,7 @@ public class ExtendedDismaxQParser extends QParser {
/** A simple container for storing alias info
*/
- protected class Alias {
+ protected static class Alias {
public float tie;
public Map<String,Float> fields;
}
@@ -1603,7 +1603,7 @@ public class ExtendedDismaxQParser extends QParser {
/**
* Simple container for configuration information used when parsing queries
*/
- public class ExtendedDismaxConfiguration {
+ public static class ExtendedDismaxConfiguration {
/**
* The field names specified by 'qf' that (most) clauses will
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
index db0223a..f3dd51c 100644
--- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
@@ -59,7 +59,7 @@ public class HashQParserPlugin extends QParserPlugin {
return new HashQParser(query, localParams, params, request);
}
- private class HashQParser extends QParser {
+ private static class HashQParser extends QParser {
public HashQParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest request) {
super(query, localParams, params, request);
@@ -74,7 +74,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
}
- private class HashQuery extends ExtendedQueryBase implements PostFilter {
+ private static class HashQuery extends ExtendedQueryBase implements PostFilter {
private String keysParam;
private int workers;
@@ -135,7 +135,7 @@ public class HashQParserPlugin extends QParserPlugin {
return searcher.rewrite(constantScoreQuery).createWeight(searcher, false);
}
- public class BitsFilter extends Filter {
+ public static class BitsFilter extends Filter {
private FixedBitSet[] bitSets;
public BitsFilter(FixedBitSet[] bitSets) {
this.bitSets = bitSets;
@@ -166,7 +166,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
- class SegmentPartitioner implements Runnable {
+ static class SegmentPartitioner implements Runnable {
public LeafReaderContext context;
private int worker;
@@ -238,7 +238,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
}
- private class HashCollector extends DelegatingCollector {
+ private static class HashCollector extends DelegatingCollector {
private int worker;
private int workers;
private HashKey hashKey;
@@ -271,7 +271,7 @@ public class HashQParserPlugin extends QParserPlugin {
public long hashCode(int doc);
}
- private class BytesHash implements HashKey {
+ private static class BytesHash implements HashKey {
private SortedDocValues values;
private String field;
@@ -295,7 +295,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
}
- private class NumericHash implements HashKey {
+ private static class NumericHash implements HashKey {
private NumericDocValues values;
private String field;
@@ -314,7 +314,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
}
- private class ZeroHash implements HashKey {
+ private static class ZeroHash implements HashKey {
public long hashCode(int doc) {
return 0;
@@ -325,7 +325,7 @@ public class HashQParserPlugin extends QParserPlugin {
}
}
- private class CompositeHash implements HashKey {
+ private static class CompositeHash implements HashKey {
private HashKey key1;
private HashKey key2;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
index 1ac1eaf..8f6bb76 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
@@ -139,7 +139,7 @@ public class ReRankCollector extends TopDocsCollector {
}
}
- public class BoostedComp implements Comparator {
+ public static class BoostedComp implements Comparator {
IntFloatHashMap boostedMap;
public BoostedComp(IntIntHashMap boostedDocs, ScoreDoc[] scoreDocs, float maxScore) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
index 3e8bf86..1190cdb 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -71,7 +71,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
}
}
- private final class ReRankQueryRescorer extends QueryRescorer {
+ private static final class ReRankQueryRescorer extends QueryRescorer {
final double reRankWeight;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
index 9f99919..63e8743 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java
@@ -169,7 +169,7 @@ public class FacetFieldMerger extends FacetRequestSortedMerger<FacetField> {
- private class FacetNumBucketsMerger extends FacetMerger {
+ private static class FacetNumBucketsMerger extends FacetMerger {
long sumBuckets;
long shardsMissingSum;
long shardsTruncatedSum;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java
index 83f47a8..8e2c603 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java
@@ -188,7 +188,7 @@ public class UniqueAgg extends StrAggValueSource {
}
- class NumericAcc extends SlotAcc {
+ static class NumericAcc extends SlotAcc {
SchemaField sf;
LongSet[] sets;
NumericDocValues values;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
index 5378ea0..3932f56 100644
--- a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
+++ b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java
@@ -45,7 +45,7 @@ public class CollapseScoreFunction extends ValueSource {
return new CollapseScoreFunctionValues(context);
}
- public class CollapseScoreFunctionValues extends FunctionValues {
+ public static class CollapseScoreFunctionValues extends FunctionValues {
private CollapseScore cscore;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java
index 58bbac8..ab518e8 100644
--- a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java
+++ b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java
@@ -325,7 +325,7 @@ public class GraphQuery extends Query {
}
- private class GraphScorer extends Scorer {
+ private static class GraphScorer extends Scorer {
final DocIdSetIterator iter;
final float score;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
index c4a7503..0203f18 100644
--- a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
+++ b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
@@ -360,7 +360,7 @@ public class PossibilityIterator implements
throw new UnsupportedOperationException();
}
- public class RankedSpellPossibility {
+ public static class RankedSpellPossibility {
public List<SpellCheckCorrection> corrections;
public int rank;
public int index;
@@ -406,7 +406,7 @@ public class PossibilityIterator implements
}
}
- private class StartOffsetComparator implements
+ private static class StartOffsetComparator implements
Comparator<SpellCheckCorrection> {
@Override
public int compare(SpellCheckCorrection o1, SpellCheckCorrection o2) {
@@ -414,7 +414,7 @@ public class PossibilityIterator implements
}
}
- private class RankComparator implements Comparator<RankedSpellPossibility> {
+ private static class RankComparator implements Comparator<RankedSpellPossibility> {
// Rank poorer suggestions ahead of better ones for use with a PriorityQueue
@Override
public int compare(RankedSpellPossibility r1, RankedSpellPossibility r2) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 610cc20..de9916e 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -203,7 +203,7 @@ public static final int VERSION_IDX = 1;
}
};
- public class DBQ {
+ public static class DBQ {
public String q; // the query string
public long version; // positive version of the DBQ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/util/RTimer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/RTimer.java b/solr/core/src/java/org/apache/solr/util/RTimer.java
index 7bf075c..1962460 100644
--- a/solr/core/src/java/org/apache/solr/util/RTimer.java
+++ b/solr/core/src/java/org/apache/solr/util/RTimer.java
@@ -41,7 +41,7 @@ public class RTimer {
double elapsed();
}
- private class NanoTimeTimerImpl implements TimerImpl {
+ private static class NanoTimeTimerImpl implements TimerImpl {
private long start;
public void start() {
start = System.nanoTime();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
index a8ef372..e642089 100644
--- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
+++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
@@ -1065,7 +1065,7 @@ public class SimplePostTool {
/**
* Inner class to filter files based on glob wildcards
*/
- class GlobFileFilter implements FileFilter
+ static class GlobFileFilter implements FileFilter
{
private String _pattern;
private Pattern p;
@@ -1258,7 +1258,7 @@ public class SimplePostTool {
/**
* Utility class to hold the result form a page fetch
*/
- public class PageFetcherResult {
+ public static class PageFetcherResult {
int httpStatus = 200;
String contentType = "text/html";
URL redirectUrl = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
index ba183f8..6099ee2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java
@@ -816,7 +816,7 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase {
return info;
}
- protected class CollectionInfo {
+ protected static class CollectionInfo {
List<CoreInfo> coreInfos = new ArrayList<>();
@@ -869,7 +869,7 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase {
this.coreInfos.add(info);
}
- public class CoreInfo {
+ public static class CoreInfo {
String collectionName;
String shard;
boolean isLeader;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index c5f3464..a416f66 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -392,8 +392,8 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
SolrInputDocument doc = getDoc(fields);
indexDoc(doc);
}
-
- class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+
+ static class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
public ErrorLoggingConcurrentUpdateSolrClient(String serverUrl, HttpClient httpClient, int queueSize, int threadCount) {
super(serverUrl, httpClient, queueSize, threadCount, null, false);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
index 17d4c54..90d9cc1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
@@ -153,7 +153,7 @@ public class ConnectionManagerTest extends SolrTestCaseJ4 {
}
}
- private class MockZkClientConnectionStrategy extends DefaultConnectionStrategy {
+ private static class MockZkClientConnectionStrategy extends DefaultConnectionStrategy {
int called = 0;
boolean exceptionThrown = false;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
index d1192a1..b6754c7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
@@ -202,7 +202,7 @@ public class DistributedQueueTest extends SolrTestCaseJ4 {
return new DistributedQueue(zkClient, setupNewDistributedQueueZNode(dqZNode));
}
- private class QueueChangerThread extends Thread {
+ private static class QueueChangerThread extends Thread {
DistributedQueue dq;
long waitBeforeOfferMs;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
index 2582872..cab5ee3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
@@ -83,8 +83,8 @@ public class LeaderElectionTest extends SolrTestCaseJ4 {
zkClient.makePath("/collections/collection1", true);
zkClient.makePath("/collections/collection2", true);
}
-
- class TestLeaderElectionContext extends ShardLeaderElectionContextBase {
+
+ static class TestLeaderElectionContext extends ShardLeaderElectionContextBase {
private long runLeaderDelay = 0;
public TestLeaderElectionContext(LeaderElector leaderElector,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java
index 56c0df9..f4cbc77 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java
@@ -214,7 +214,7 @@ public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {
}
}
- private class SolrZkClientFactoryUsingCompletelyNewProviders {
+ private static class SolrZkClientFactoryUsingCompletelyNewProviders {
final String digestUsername;
final String digestPassword;
@@ -274,7 +274,7 @@ public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {
}
- private class SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames extends SolrZkClient {
+ private static class SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames extends SolrZkClient {
public SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames(String zkServerAddress, int zkClientTimeout) {
super(zkServerAddress, zkClientTimeout);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index 635292a..48ac91f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
@@ -78,7 +78,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 {
private Thread thread;
private Queue<QueueEvent> queue = new ArrayBlockingQueue<>(10);
- private class OverseerCollectionConfigSetProcessorToBeTested extends
+ private static class OverseerCollectionConfigSetProcessorToBeTested extends
OverseerCollectionConfigSetProcessor {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
index faa2ba7..b3a3d7e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
@@ -40,7 +40,7 @@ public class ZkSolrClientTest extends AbstractSolrTestCase {
initCore("solrconfig.xml", "schema.xml");
}
- class ZkConnection implements AutoCloseable {
+ static class ZkConnection implements AutoCloseable {
private ZkTestServer server = null;
private SolrZkClient zkClient = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
index 7a7fb9c..8714054 100644
--- a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java
@@ -41,7 +41,7 @@ public class CachingDirectoryFactoryTest extends SolrTestCaseJ4 {
private Map<String,Tracker> dirs = new HashMap<>();
private volatile boolean stop = false;
- private class Tracker {
+ private static class Tracker {
String path;
AtomicInteger refCnt = new AtomicInteger(0);
Directory dir;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
index d5f8492..2b52720 100644
--- a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
+++ b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
@@ -49,7 +49,7 @@ public abstract class AnalysisRequestHandlerTestBase extends SolrTestCaseJ4 {
//================================================= Inner Classes ==================================================
- protected class TokenInfo {
+ protected static class TokenInfo {
private String text;
private String rawText;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
index 96a01c3..b9ab2c1 100644
--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
@@ -231,7 +231,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
return rsp;
}
- class SolrPingWithDistrib extends SolrPing {
+ static class SolrPingWithDistrib extends SolrPing {
public SolrPing setDistrib(boolean distrib) {
getParams().add("distrib", distrib ? "true" : "false");
return this;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
index 7282e19..1113610 100644
--- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
@@ -201,7 +201,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
p.assertNoCommandsPending();
}
- private class MockUpdateRequestProcessor extends UpdateRequestProcessor {
+ private static class MockUpdateRequestProcessor extends UpdateRequestProcessor {
private Queue<DeleteUpdateCommand> deleteCommands = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
index d026ecd..890ef4a 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
@@ -50,7 +50,7 @@ public class CoreMergeIndexesAdminHandlerTest extends SolrTestCaseJ4 {
private static String FAILING_MSG = "Creating a directory using FailingDirectoryFactoryException always fails";
public static class FailingDirectoryFactory extends MockFSDirectoryFactory {
- public class FailingDirectoryFactoryException extends RuntimeException {
+ public static class FailingDirectoryFactoryException extends RuntimeException {
public FailingDirectoryFactoryException() {
super(FAILING_MSG);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
index 0688c52..ba604f8 100644
--- a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
+++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java
@@ -37,7 +37,7 @@ public class CSVParserTest extends TestCase {
/**
* TestCSVParser.
*/
- class TestCSVParser extends CSVParser {
+ static class TestCSVParser extends CSVParser {
/**
* Test parser to investigate the type of the internal Token.
* @param in a Reader
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
index e58c9dd..f45b193 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
@@ -78,7 +78,7 @@ public class SolrGraphiteReporterTest extends SolrTestCaseJ4 {
}
}
- private class MockGraphite extends Thread {
+ private static class MockGraphite extends Thread {
private List<String> lines = new ArrayList<>();
private ServerSocket server = null;
private int port;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
index e974b42..72af04b 100644
--- a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
@@ -84,7 +84,7 @@ public class TestGraphMLResponseWriter extends SolrTestCaseJ4 {
}
- private class TestStream extends TupleStream {
+ private static class TestStream extends TupleStream {
private Iterator<Tuple> tuples;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java
index cce2109..c06abf0 100644
--- a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java
@@ -49,7 +49,7 @@ public class TestManagedResource extends SolrTestCaseJ4 {
* Mock class that acts like an analysis component that depends on
* data managed by a ManagedResource
*/
- private class MockAnalysisComponent implements ManagedResourceObserver {
+ private static class MockAnalysisComponent implements ManagedResourceObserver {
private boolean wasNotified = false;
@@ -121,7 +121,7 @@ public class TestManagedResource extends SolrTestCaseJ4 {
/**
* Implements a Java serialization based storage format.
*/
- private class SerializableStorage extends ManagedResourceStorage {
+ private static class SerializableStorage extends ManagedResourceStorage {
SerializableStorage(StorageIO storageIO, SolrResourceLoader loader) {
super(storageIO, loader);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
index ab2c45b..cc6c58a 100644
--- a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
+++ b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
@@ -62,7 +62,7 @@ public class TestRestManager extends SolrRestletTestBase {
}
- private class MockAnalysisComponent implements ManagedResourceObserver {
+ private static class MockAnalysisComponent implements ManagedResourceObserver {
@Override
public void onManagedResourceInitialized(NamedList<?> args, ManagedResource res)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
index e724da9..e6e4da1 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
@@ -248,7 +248,7 @@ public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestB
schemaLockTest();
}
- private class Info {
+ private static class Info {
int numAddFieldPuts = 0;
int numAddFieldPosts = 0;
int numAddDynamicFieldPuts = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
index 392fb82..158df17 100644
--- a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java
@@ -42,7 +42,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
return new TestAnalyticsQueryParser(query, localParams, params, req);
}
- class TestAnalyticsQueryParser extends QParser {
+ static class TestAnalyticsQueryParser extends QParser {
public TestAnalyticsQueryParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
super(query, localParams, params, req);
@@ -58,7 +58,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
}
}
- class TestAnalyticsQuery extends AnalyticsQuery {
+ static class TestAnalyticsQuery extends AnalyticsQuery {
private int base;
@@ -72,7 +72,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
}
}
- class TestAnalyticsCollector extends DelegatingCollector {
+ static class TestAnalyticsCollector extends DelegatingCollector {
ResponseBuilder rb;
int count;
int base;
@@ -97,7 +97,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
}
}
- class TestAnalyticsMergeStrategy implements MergeStrategy {
+ static class TestAnalyticsMergeStrategy implements MergeStrategy {
public boolean mergesIds() {
return false;
@@ -130,7 +130,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin {
}
}
- class TestIterative extends IterativeMergeStrategy {
+ static class TestIterative extends IterativeMergeStrategy {
public void process(ResponseBuilder rb, ShardRequest sreq) throws Exception {
int count = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 27bf40f..a887fed 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -1830,7 +1830,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
return false;
}
- class MultilanguageQueryParser extends ExtendedDismaxQParser {
+ static class MultilanguageQueryParser extends ExtendedDismaxQParser {
public MultilanguageQueryParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) {
@@ -1857,10 +1857,10 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
}
}
-
-
-
- class FuzzyDismaxQParser extends ExtendedDismaxQParser {
+
+
+
+ static class FuzzyDismaxQParser extends ExtendedDismaxQParser {
public FuzzyDismaxQParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/search/TestFiltering.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index 9f9a51a..c718283 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -174,7 +174,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
}
- class Model {
+ static class Model {
int indexSize;
FixedBitSet answer;
FixedBitSet multiSelect;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
index 30337ca..7fbc702 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
@@ -75,7 +75,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
return new TestRankQueryParser(query, localParams, params, req);
}
- class TestRankQueryParser extends QParser {
+ static class TestRankQueryParser extends QParser {
public TestRankQueryParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
super(query, localParams, params, req);
@@ -89,7 +89,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
}
- class TestRankQuery extends RankQuery {
+ static class TestRankQuery extends RankQuery {
private int mergeStrategy;
private int collector;
@@ -143,7 +143,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
}
- class TestMergeStrategy implements MergeStrategy {
+ static class TestMergeStrategy implements MergeStrategy {
public int getCost() {
return 1;
@@ -314,7 +314,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
}
- class TestMergeStrategy1 implements MergeStrategy {
+ static class TestMergeStrategy1 implements MergeStrategy {
public int getCost() {
return 1;
@@ -435,7 +435,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
}
- private class FakeScorer extends Scorer {
+ private static class FakeScorer extends Scorer {
final int docid;
final float score;
@@ -674,7 +674,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
- class TestCollector extends TopDocsCollector {
+ static class TestCollector extends TopDocsCollector {
private List<ScoreDoc> list = new ArrayList();
@@ -733,7 +733,7 @@ public class TestRankQueryPlugin extends QParserPlugin {
}
}
- class TestCollector1 extends TopDocsCollector {
+ static class TestCollector1 extends TopDocsCollector {
private List<ScoreDoc> list = new ArrayList();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
index 2a7daa9..31f20fb 100644
--- a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
@@ -44,8 +44,8 @@ public class ConjunctionSolrSpellCheckerTest extends LuceneTestCase {
// correct behavior
}
}
-
- class MockSolrSpellChecker extends SolrSpellChecker {
+
+ static class MockSolrSpellChecker extends SolrSpellChecker {
final StringDistance sd;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
index 75de4db..b221044 100644
--- a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
@@ -230,7 +230,7 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 {
}
}
- private class TestSpellChecker extends IndexBasedSpellChecker{
+ private static class TestSpellChecker extends IndexBasedSpellChecker{
@Override
public SpellChecker getSpellChecker(){
return spellChecker;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
index 4272c24..99f7ce6 100644
--- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
+++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
public class BlockDirectoryTest extends SolrTestCaseJ4 {
- private class MapperCache implements Cache {
+ private static class MapperCache implements Cache {
public Map<String, byte[]> map = Caffeine.newBuilder()
.maximumSize(8)
.<String, byte[]>build()
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
index 7f70024..c9f8fc5 100644
--- a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
@@ -225,7 +225,7 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
@Override
public PageFetcherResult readPageFromUrl(URL u) {
- PageFetcherResult res = (new SimplePostTool()).new PageFetcherResult();
+ PageFetcherResult res = new PageFetcherResult();
if (isDisallowedByRobots(u)) {
res.httpStatus = 403;
return res;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
index e41484f..af85ad6 100644
--- a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
@@ -400,7 +400,7 @@ public class SolrPluginUtilsTest extends SolrTestCaseJ4 {
assertEquals(3, q.build().getMinimumNumberShouldMatch());
}
- private class InvokeSettersTestClass {
+ private static class InvokeSettersTestClass {
private float aFloat = random().nextFloat();
public float getAFloat() {
return aFloat;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index 28a58ff..7980560 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -72,7 +72,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
* Overrides the call to exec bin/solr to start Solr nodes to start them using the Solr test-framework
* instead of the script, since the script depends on a full build.
*/
- private class RunExampleExecutor extends DefaultExecutor implements Closeable {
+ private static class RunExampleExecutor extends DefaultExecutor implements Closeable {
private PrintStream stdout;
private List<org.apache.commons.exec.CommandLine> commandsExecuted = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
index 677fe7e..c549709 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
@@ -380,7 +380,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
/**
* Class representing an UpdateRequest and an optional collection.
*/
- class Update {
+ static class Update {
UpdateRequest request;
String collection;
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java
index 4676594..1d7e46f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java
@@ -110,7 +110,7 @@ public class ModelCache {
}
}
- private class Model {
+ private static class Model {
private Tuple tuple;
private long lastChecked;
@@ -128,7 +128,7 @@ public class ModelCache {
}
}
- private class LRU extends LinkedHashMap<String, Model> {
+ private static class LRU extends LinkedHashMap<String, Model> {
private int maxSize;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
index 8059677..bbd7669 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
@@ -624,7 +624,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {
return null;
}
- class NodeStream extends TupleStream {
+ static class NodeStream extends TupleStream {
private List<String> ids;
private Iterator<String> it;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
index aa546ae..5075330 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
@@ -492,7 +492,7 @@ public class ShortestPathStream extends TupleStream implements Expressible {
}
}
- private class Edge {
+ private static class Edge {
private String from;
private String to;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
index 4a28cc1..a2bd8c9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
@@ -133,7 +133,7 @@ public class GroupOperation implements ReduceOperation {
}
}
- class ReverseComp implements Comparator<Tuple>, Serializable {
+ static class ReverseComp implements Comparator<Tuple>, Serializable {
private StreamComparator comp;
public ReverseComp(StreamComparator comp) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
index a9fb1af..e301081 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
@@ -213,7 +213,7 @@ public class RankStream extends TupleStream implements Expressible {
return 0;
}
- class ReverseComp implements Comparator<Tuple>, Serializable {
+ static class ReverseComp implements Comparator<Tuple>, Serializable {
private static final long serialVersionUID = 1L;
private StreamComparator comp;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index b4decd5..45cd272 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -339,7 +339,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible{
}
}
- private class ScoreComp implements Comparator<Map> {
+ private static class ScoreComp implements Comparator<Map> {
public int compare(Map a, Map b) {
Float scorea = (Float)a.get("score");
Float scoreb = (Float)b.get("score");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
index 5a70ced..a6ba9d9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
@@ -532,7 +532,7 @@ public class TextLogitStream extends TupleStream implements Expressible {
return buf.toString();
}
- protected class TermsStream extends TupleStream {
+ protected static class TermsStream extends TupleStream {
private List<String> terms;
private Iterator<String> it;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
index 946225d..89ef351 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
@@ -211,7 +211,7 @@ public class SpellCheckResponse {
}
- public class Collation {
+ public static class Collation {
private String collationQueryString;
private List<Correction> misspellingsAndCorrections = new ArrayList<>();
private long numberOfHits;
@@ -244,7 +244,7 @@ public class SpellCheckResponse {
}
- public class Correction {
+ public static class Correction {
private String original;
private String correction;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 752c5a4..40411a1 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -144,7 +144,7 @@ public class ZkStateReader implements Closeable {
private final ExecutorService notifications = ExecutorUtil.newMDCAwareCachedThreadPool("watches");
- private class CollectionWatch {
+ private static class CollectionWatch {
int coreRefCount = 0;
Set<CollectionStateWatcher> stateWatchers = ConcurrentHashMap.newKeySet();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index e523b8d..826d8e2 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -248,7 +248,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
}
}
- private class SolrInstance {
+ private static class SolrInstance {
String name;
File homeDir;
File dataDir;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
index 093238d..02ed7be 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
@@ -104,8 +104,8 @@ public class SolrExampleStreamingTest extends SolrExampleTests {
null, failures.get(0));
}
}
-
- class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+
+ static class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
private final List<Throwable> failures = new ArrayList<>();
public FailureRecordingConcurrentUpdateSolrClient(String serverUrl, int queueSize, int numThreads) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
index de728bd..24f08d2 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
@@ -252,7 +252,7 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase {
}
- class SendDocsRunnable implements Runnable {
+ static class SendDocsRunnable implements Runnable {
private String id;
private int numDocs;
@@ -289,8 +289,8 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase {
}
}
}
-
- class OutcomeCountingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
+
+ static class OutcomeCountingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient {
private final AtomicInteger successCounter;
private final AtomicInteger failureCounter;
private final StringBuilder errors;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index e207e53..770785b 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -1626,7 +1626,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
}
}
- protected class FldType {
+ protected static class FldType {
public String fname;
public IVals numValues;
public Vals vals;
[3/4] lucene-solr:branch_6x: LUCENE-7751: Avoid boxing primitives
only to call compareTo.
Posted by jp...@apache.org.
LUCENE-7751: Avoid boxing primitives only to call compareTo.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/103a5015
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/103a5015
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/103a5015
Branch: refs/heads/branch_6x
Commit: 103a50153cabf66a20c6fef32e839fa2de8a6969
Parents: a608398
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Mar 28 15:21:35 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Mar 28 16:27:45 2017 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java | 2 +-
.../src/java/org/apache/solr/spelling/SpellCheckCollation.java | 2 +-
.../solr/handler/component/DistributedFacetPivotSmallTest.java | 5 ++---
solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/103a5015/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 33a8fc4..de63e0e 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -10,6 +10,9 @@ Other
* LUCENE-7754: Inner classes should be static whenever possible.
(Daniel Jelinski via Adrien Grand)
+* LUCENE-7751: Avoid boxing primitives only to call compareTo.
+ (Daniel Jelinski via Adrien Grand)
+
======================= Lucene 6.5.0 =======================
API Changes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/103a5015/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java b/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
index f21c16b..ea56862 100644
--- a/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
+++ b/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
@@ -143,7 +143,7 @@ public final class VirtualMethod<C> {
public static <C> int compareImplementationDistance(final Class<? extends C> clazz,
final VirtualMethod<C> m1, final VirtualMethod<C> m2)
{
- return Integer.valueOf(m1.getImplementationDistance(clazz)).compareTo(m2.getImplementationDistance(clazz));
+ return Integer.compare(m1.getImplementationDistance(clazz), m2.getImplementationDistance(clazz));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/103a5015/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java
index bef3ec6..7f3bd95 100644
--- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java
+++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java
@@ -26,7 +26,7 @@ public class SpellCheckCollation implements Comparable<SpellCheckCollation> {
@Override
public int compareTo(SpellCheckCollation scc) {
- int c = new Integer(internalRank).compareTo(scc.internalRank);
+ int c = Integer.compare(internalRank, scc.internalRank);
if (c == 0) {
return collationQuery.compareTo(scc.collationQuery);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/103a5015/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
index fc7af80..d293e69 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
@@ -1636,8 +1636,7 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
@Override
public int compare(PivotField o1, PivotField o2) {
- Integer compare = (Integer.valueOf(o2.getCount())).compareTo(Integer
- .valueOf(o1.getCount()));
+ int compare = Integer.compare(o2.getCount(), o1.getCount());
if (compare == 0) {
compare = ((String) o2.getValue()).compareTo((String) o1.getValue());
}
@@ -1650,7 +1649,7 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
}
}
if (compare == 0) {
- compare = Integer.valueOf(o1.getFacetQuery().size()).compareTo(
+ compare = Integer.compare(o1.getFacetQuery().size(),
o2.getFacetQuery().size());
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/103a5015/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
index 6fffb3a..846c25e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
@@ -134,8 +134,8 @@ public abstract class DocRouter {
@Override
public int compareTo(Range that) {
- int mincomp = Integer.valueOf(this.min).compareTo(that.min);
- return mincomp == 0 ? Integer.valueOf(this.max).compareTo(that.max) : mincomp;
+ int mincomp = Integer.compare(this.min, that.min);
+ return mincomp == 0 ? Integer.compare(this.max, that.max) : mincomp;
}
}
[4/4] lucene-solr:branch_6x: LUCENE-7743: Avoid calling new
String(String).
Posted by jp...@apache.org.
LUCENE-7743: Avoid calling new String(String).
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/03e50781
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/03e50781
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/03e50781
Branch: refs/heads/branch_6x
Commit: 03e50781463827a5d8188fccf0307f72dea4e450
Parents: 103a501
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Mar 28 15:25:16 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Mar 28 16:27:46 2017 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../lucene/analysis/compound/hyphenation/TernaryTree.java | 2 +-
.../java/org/apache/lucene/analysis/cn/smart/Utility.java | 8 ++++----
.../src/test/org/apache/lucene/index/TestIndexWriter.java | 2 +-
.../test/org/apache/lucene/util/TestRamUsageEstimator.java | 8 ++++----
.../solr/handler/dataimport/AbstractDIHCacheTestCase.java | 2 +-
.../org/apache/solr/highlight/DefaultSolrHighlighter.java | 3 +--
solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java | 4 ++--
.../test/org/apache/solr/response/TestSolrQueryResponse.java | 2 +-
.../solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java | 2 +-
10 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index de63e0e..70fbe67 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -13,6 +13,9 @@ Other
* LUCENE-7751: Avoid boxing primitives only to call compareTo.
(Daniel Jelinski via Adrien Grand)
+* LUCENE-7743: Never call new String(String).
+ (Daniel Jelinski via Adrien Grand)
+
======================= Lucene 6.5.0 =======================
API Changes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
index 6aeb69b..a331d2a 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
@@ -516,7 +516,7 @@ public class TernaryTree implements Cloneable {
@Override
public String nextElement() {
- String res = new String(curkey);
+ String res = curkey;
cur = up();
run();
return res;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
index aca80e7..81ca52e 100644
--- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
+++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
@@ -24,16 +24,16 @@ import org.apache.lucene.analysis.cn.smart.hhmm.SegTokenFilter; // for javadoc
*/
public class Utility {
- public static final char[] STRING_CHAR_ARRAY = new String("\u672a##\u4e32")
+ public static final char[] STRING_CHAR_ARRAY = "\u672a##\u4e32"
.toCharArray();
- public static final char[] NUMBER_CHAR_ARRAY = new String("\u672a##\u6570")
+ public static final char[] NUMBER_CHAR_ARRAY = "\u672a##\u6570"
.toCharArray();
- public static final char[] START_CHAR_ARRAY = new String("\u59cb##\u59cb")
+ public static final char[] START_CHAR_ARRAY = "\u59cb##\u59cb"
.toCharArray();
- public static final char[] END_CHAR_ARRAY = new String("\u672b##\u672b").toCharArray();
+ public static final char[] END_CHAR_ARRAY = "\u672b##\u672b".toCharArray();
/**
* Delimiters will be filtered to this character by {@link SegTokenFilter}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index 20ea43c..01848fe 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -1153,7 +1153,7 @@ public class TestIndexWriter extends LuceneTestCase {
t.finish = true;
t.join();
if (t.failed) {
- fail(new String(t.bytesLog.toString("UTF-8")));
+ fail(t.bytesLog.toString("UTF-8"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java
index cf53c2d..34128ad 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java
@@ -24,7 +24,7 @@ import java.util.Random;
public class TestRamUsageEstimator extends LuceneTestCase {
public void testSanity() {
- assertTrue(sizeOf(new String("test string")) > shallowSizeOfInstance(String.class));
+ assertTrue(sizeOf("test string") > shallowSizeOfInstance(String.class));
Holder holder = new Holder();
holder.holder = new Holder("string2", 5000L);
@@ -37,9 +37,9 @@ public class TestRamUsageEstimator extends LuceneTestCase {
shallowSizeOfInstance(Holder.class) == shallowSizeOfInstance(HolderSubclass2.class));
String[] strings = new String[] {
- new String("test string"),
- new String("hollow"),
- new String("catchmaster")
+ "test string",
+ "hollow",
+ "catchmaster"
};
assertTrue(sizeOf(strings) > shallowSizeOf(strings));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
index 2ef5a91..8c7109d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
@@ -47,7 +47,7 @@ public class AbstractDIHCacheTestCase {
@Before
public void setup() {
try {
- APPLE = new SerialClob(new String("Apples grow on trees and they are good to eat.").toCharArray());
+ APPLE = new SerialClob("Apples grow on trees and they are good to eat.".toCharArray());
} catch (SQLException sqe) {
Assert.fail("Could not Set up Test");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
index c5a6d0a..93c7688 100644
--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
@@ -733,9 +733,8 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
if( alternateFieldLen <= 0 ){
altList.add(encoder.encodeText(altText));
} else{
- //note: seemingly redundant new String(...) releases memory to the larger text. But is copying better?
altList.add( len + altText.length() > alternateFieldLen ?
- encoder.encodeText(new String(altText.substring( 0, alternateFieldLen - len ))) :
+ encoder.encodeText(altText.substring(0, alternateFieldLen - len)) :
encoder.encodeText(altText) );
len += altText.length();
if( len >= alternateFieldLen ) break;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
index 8b29d48..dc999f1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
@@ -272,7 +272,7 @@ public class ZkCLITest extends SolrTestCaseJ4 {
@Test
public void testGet() throws Exception {
String getNode = "/getNode";
- byte [] data = new String("getNode-data").getBytes(StandardCharsets.UTF_8);
+ byte [] data = "getNode-data".getBytes(StandardCharsets.UTF_8);
this.zkClient.create(getNode, data, CreateMode.PERSISTENT, true);
String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"get", getNode};
@@ -284,7 +284,7 @@ public class ZkCLITest extends SolrTestCaseJ4 {
File tmpDir = createTempDir().toFile();
String getNode = "/getFileNode";
- byte [] data = new String("getFileNode-data").getBytes(StandardCharsets.UTF_8);
+ byte [] data = "getFileNode-data".getBytes(StandardCharsets.UTF_8);
this.zkClient.create(getNode, data, CreateMode.PERSISTENT, true);
File file = new File(tmpDir,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
index 8b17dc6..046582f 100644
--- a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
+++ b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java
@@ -79,7 +79,7 @@ public class TestSolrQueryResponse extends LuceneTestCase {
final SolrQueryResponse response = new SolrQueryResponse();
assertEquals("response initial value", null, response.getResponse());
final Object newValue = (random().nextBoolean()
- ? (random().nextBoolean() ? new String("answer") : new Integer(42)) : null);
+ ? (random().nextBoolean() ? "answer" : Integer.valueOf(42)) : null);
response.addResponse(newValue);
assertEquals("response new value", newValue, response.getResponse());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03e50781/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java b/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java
index a58c268..4b79975 100644
--- a/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java
+++ b/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java
@@ -26,7 +26,7 @@ import org.apache.solr.search.QParser;
public class TrieIntPrefixActsAsRangeQueryFieldType extends TrieIntField {
public Query getPrefixQuery(QParser parser, SchemaField sf, String termStr) {
- return getRangeQuery(parser, sf, termStr, new String(Integer.MAX_VALUE + ""), true, false);
+ return getRangeQuery(parser, sf, termStr, Integer.MAX_VALUE + "", true, false);
}
}
[2/4] lucene-solr:branch_6x: LUCENE-7754: Inner classes should be
static whenever possible.
Posted by jp...@apache.org.
LUCENE-7754: Inner classes should be static whenever possible.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a6083982
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a6083982
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a6083982
Branch: refs/heads/branch_6x
Commit: a6083982180979aec1f5e782378055ef78089ff9
Parents: 15a04fe
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Mar 28 15:15:45 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Mar 28 16:27:44 2017 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 6 +++++-
.../analysis/charfilter/HTMLStripCharFilter.java | 2 +-
.../analysis/charfilter/HTMLStripCharFilter.jflex | 7 +++----
.../lucene/analysis/shingle/ShingleFilter.java | 2 +-
.../lucene/analysis/hunspell/TestDictionary.java | 2 +-
.../miscellaneous/TestWordDelimiterFilter.java | 2 +-
.../TestWordDelimiterGraphFilter.java | 2 +-
.../payloads/NumericPayloadTokenFilterTest.java | 2 +-
.../payloads/TypeAsPayloadTokenFilterTest.java | 2 +-
.../analysis/sinks/TestTeeSinkTokenFilter.java | 4 ++--
.../lucene/analysis/snowball/TestSnowball.java | 2 +-
.../standard/TestUAX29URLEmailTokenizer.java | 4 ++--
.../lucene/analysis/icu/ICUTransformFilter.java | 2 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../bloom/BloomFilteringPostingsFormat.java | 8 ++++----
.../codecs/memory/MemoryPostingsFormat.java | 4 ----
.../simpletext/SimpleTextTermVectorsReader.java | 2 +-
.../compressing/CompressingTermVectorsReader.java | 2 +-
.../apache/lucene/index/ParallelLeafReader.java | 2 +-
.../apache/lucene/search/ConstantScoreQuery.java | 2 +-
.../test/org/apache/lucene/index/TestCodecs.java | 8 ++++----
.../index/TestFlushByRamOrCountsPolicy.java | 2 +-
.../lucene/index/TestIndexWriterExceptions.java | 2 +-
.../lucene/index/TestIndexWriterMerging.java | 2 +-
.../lucene/index/TestIndexWriterWithThreads.java | 2 +-
.../apache/lucene/index/TestIndexableField.java | 2 +-
.../apache/lucene/index/TestMaxTermFrequency.java | 2 +-
.../test/org/apache/lucene/index/TestNorms.java | 2 +-
.../lucene/index/TestPerSegmentDeletes.java | 2 +-
.../apache/lucene/index/TestStressIndexing2.java | 2 +-
.../lucene/index/TestTermVectorsReader.java | 2 +-
.../lucene/index/TestTransactionRollback.java | 6 +++---
.../apache/lucene/index/TestUniqueTermCount.java | 2 +-
.../lucene/search/TestCustomSearcherSort.java | 4 ++--
.../TestEarlyTerminatingSortingCollector.java | 4 ++--
.../apache/lucene/search/TestPrefixRandom.java | 4 ++--
.../apache/lucene/search/TestRegexpRandom2.java | 2 +-
.../lucene/search/TestSimilarityProvider.java | 6 +++---
.../org/apache/lucene/search/TestTermScorer.java | 2 +-
.../lucene/search/TestTimeLimitingCollector.java | 2 +-
.../org/apache/lucene/store/TestLockFactory.java | 4 ++--
.../lucene/util/TestCloseableThreadLocal.java | 2 +-
.../org/apache/lucene/util/TestQueryBuilder.java | 2 +-
.../test/org/apache/lucene/util/fst/TestFSTs.java | 2 +-
.../facet/taxonomy/writercache/CollisionMap.java | 2 +-
.../search/grouping/GroupFacetCollectorTest.java | 4 ++--
.../TestUnifiedHighlighterExtensibility.java | 2 +-
.../apache/lucene/queries/CustomScoreQuery.java | 2 +-
.../lucene/queries/TestCustomScoreQuery.java | 2 +-
.../lucene/queries/payloads/TestPayloadSpans.java | 6 +++---
.../queryparser/classic/TestMultiAnalyzer.java | 8 ++++----
.../classic/TestMultiFieldQueryParser.java | 2 +-
.../standard/TestMultiAnalyzerQPHelper.java | 8 ++++----
.../flexible/standard/TestQPHelper.java | 8 ++++----
.../queryparser/util/QueryParserTestBase.java | 10 +++++-----
.../sandbox/queries/FuzzyLikeThisQuery.java | 2 +-
.../lucene/payloads/TestPayloadSpanUtil.java | 4 ++--
.../search/spell/WordBreakSpellChecker.java | 10 +++++-----
.../search/suggest/document/ContextQuery.java | 2 +-
.../search/suggest/fst/ExternalRefSorter.java | 2 +-
.../search/suggest/fst/WFSTCompletionLookup.java | 2 +-
.../search/suggest/jaspell/JaspellLookup.java | 8 ++++----
.../suggest/jaspell/JaspellTernarySearchTrie.java | 2 +-
.../search/suggest/DocumentDictionaryTest.java | 2 +-
.../analyzing/AnalyzingInfixSuggesterTest.java | 2 +-
.../suggest/analyzing/FuzzySuggesterTest.java | 2 +-
.../lucene/store/BaseLockFactoryTestCase.java | 2 +-
.../dependencies/GetMavenDependenciesTask.java | 2 +-
.../lucene/validation/LibVersionsCheckTask.java | 2 +-
.../handler/dataimport/MailEntityProcessor.java | 4 ++--
.../solr/handler/dataimport/VariableResolver.java | 2 +-
.../dataimport/AbstractDIHCacheTestCase.java | 2 +-
.../AbstractSqlEntityProcessorTestCase.java | 4 ++--
.../dataimport/TestContentStreamDataSource.java | 2 +-
.../handler/extraction/XLSXResponseWriter.java | 2 +-
.../java/org/apache/solr/ltr/LTRScoringQuery.java | 2 +-
.../apache/solr/ltr/TestLTRReRankingPipeline.java | 2 +-
.../solr/response/VelocityResponseWriter.java | 2 +-
.../src/java/org/apache/solr/cloud/Overseer.java | 2 +-
.../org/apache/solr/cloud/OverseerTaskQueue.java | 2 +-
.../java/org/apache/solr/cloud/ZkController.java | 2 +-
.../apache/solr/core/CachingDirectoryFactory.java | 2 +-
.../org/apache/solr/handler/CdcrReplicator.java | 2 +-
.../apache/solr/handler/CdcrReplicatorState.java | 6 +++---
.../org/apache/solr/handler/ExportWriter.java | 18 +++++++++---------
.../org/apache/solr/handler/IndexFetcher.java | 4 ++--
.../java/org/apache/solr/handler/SQLHandler.java | 2 +-
.../solr/handler/component/ExpandComponent.java | 6 +++---
.../component/HttpShardHandlerFactory.java | 2 +-
.../component/PivotFacetFieldValueCollection.java | 4 ++--
.../solr/handler/component/TermsComponent.java | 2 +-
.../solr/highlight/DefaultSolrHighlighter.java | 2 +-
.../apache/solr/schema/ManagedIndexSchema.java | 4 ++--
.../org/apache/solr/schema/RandomSortField.java | 2 +-
.../solr/search/ComplexPhraseQParserPlugin.java | 4 ++--
.../apache/solr/search/ExportQParserPlugin.java | 2 +-
.../apache/solr/search/ExtendedDismaxQParser.java | 4 ++--
.../org/apache/solr/search/HashQParserPlugin.java | 18 +++++++++---------
.../org/apache/solr/search/ReRankCollector.java | 2 +-
.../apache/solr/search/ReRankQParserPlugin.java | 2 +-
.../solr/search/facet/FacetFieldMerger.java | 2 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../search/function/CollapseScoreFunction.java | 2 +-
.../org/apache/solr/search/join/GraphQuery.java | 2 +-
.../apache/solr/spelling/PossibilityIterator.java | 6 +++---
.../java/org/apache/solr/update/UpdateLog.java | 2 +-
.../src/java/org/apache/solr/util/RTimer.java | 2 +-
.../java/org/apache/solr/util/SimplePostTool.java | 4 ++--
.../solr/cloud/BaseCdcrDistributedZkTest.java | 4 ++--
.../solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 4 ++--
.../apache/solr/cloud/ConnectionManagerTest.java | 2 +-
.../apache/solr/cloud/DistributedQueueTest.java | 2 +-
.../org/apache/solr/cloud/LeaderElectionTest.java | 4 ++--
...verriddenZkACLAndCredentialsProvidersTest.java | 4 ++--
.../OverseerCollectionConfigSetProcessorTest.java | 2 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 2 +-
.../solr/core/CachingDirectoryFactoryTest.java | 2 +-
.../handler/AnalysisRequestHandlerTestBase.java | 2 +-
.../solr/handler/PingRequestHandlerTest.java | 2 +-
.../solr/handler/XmlUpdateRequestHandlerTest.java | 2 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 2 +-
.../apache/solr/internal/csv/CSVParserTest.java | 2 +-
.../reporters/SolrGraphiteReporterTest.java | 2 +-
.../solr/response/TestGraphMLResponseWriter.java | 2 +-
.../org/apache/solr/rest/TestManagedResource.java | 4 ++--
.../org/apache/solr/rest/TestRestManager.java | 2 +-
.../schema/TestCloudManagedSchemaConcurrent.java | 2 +-
.../solr/search/AnalyticsTestQParserPlugin.java | 10 +++++-----
.../solr/search/TestExtendedDismaxParser.java | 10 +++++-----
.../org/apache/solr/search/TestFiltering.java | 2 +-
.../apache/solr/search/TestRankQueryPlugin.java | 14 +++++++-------
.../spelling/ConjunctionSolrSpellCheckerTest.java | 4 ++--
.../solr/spelling/IndexBasedSpellCheckerTest.java | 2 +-
.../solr/store/blockcache/BlockDirectoryTest.java | 2 +-
.../org/apache/solr/util/SimplePostToolTest.java | 2 +-
.../org/apache/solr/util/SolrPluginUtilsTest.java | 2 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 2 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 2 +-
.../apache/solr/client/solrj/io/ModelCache.java | 4 ++--
.../client/solrj/io/graph/GatherNodesStream.java | 2 +-
.../client/solrj/io/graph/ShortestPathStream.java | 2 +-
.../solr/client/solrj/io/ops/GroupOperation.java | 2 +-
.../solr/client/solrj/io/stream/RankStream.java | 2 +-
.../solrj/io/stream/SignificantTermsStream.java | 2 +-
.../client/solrj/io/stream/TextLogitStream.java | 2 +-
.../client/solrj/response/SpellCheckResponse.java | 4 ++--
.../apache/solr/common/cloud/ZkStateReader.java | 2 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 2 +-
.../solrj/embedded/SolrExampleStreamingTest.java | 4 ++--
.../impl/ConcurrentUpdateSolrClientTest.java | 6 +++---
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
152 files changed, 252 insertions(+), 253 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index ef23360..33a8fc4 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -4,7 +4,11 @@ For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
======================= Lucene 6.6.0 =======================
-(No Changes)
+
+Other
+
+* LUCENE-7754: Inner classes should be static whenever possible.
+ (Daniel Jelinski via Adrien Grand)
======================= Lucene 6.5.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
index ba44dd8..a236497 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
@@ -30021,7 +30021,7 @@ public final class HTMLStripCharFilter extends BaseCharFilter {
return ZZ_BUFFERSIZE;
}
- private class TextSegment extends OpenStringBuilder {
+ private static class TextSegment extends OpenStringBuilder {
/** The position from which the next char will be read. */
int pos = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
index 98c3946..d810d79 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
@@ -19,13 +19,12 @@ package org.apache.lucene.analysis.charfilter;
import java.io.IOException;
import java.io.Reader;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.analysis.util.CharArrayMap;
-import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.analysis.CharArrayMap;
+import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.util.OpenStringBuilder;
/**
@@ -238,7 +237,7 @@ InlineElment = ( [aAbBiIqQsSuU] |
return ZZ_BUFFERSIZE;
}
- private class TextSegment extends OpenStringBuilder {
+ private static class TextSegment extends OpenStringBuilder {
/** The position from which the next char will be read. */
int pos = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
index e3fa803..0775cf7 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
@@ -583,7 +583,7 @@ public final class ShingleFilter extends TokenFilter {
}
}
- private class InputWindowToken {
+ private static class InputWindowToken {
final AttributeSource attSource;
final CharTermAttribute termAtt;
final OffsetAttribute offsetAtt;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
index 5e32afe..b7312cb 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
@@ -157,7 +157,7 @@ public class TestDictionary extends LuceneTestCase {
tempDir.close();
}
- private class CloseCheckInputStream extends FilterInputStream {
+ private static class CloseCheckInputStream extends FilterInputStream {
private boolean closed = false;
public CloseCheckInputStream(InputStream delegate) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
index 7f0481f..2804bfd 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
@@ -184,7 +184,7 @@ public class TestWordDelimiterFilter extends BaseTokenStreamTestCase {
/*
* Set a large position increment gap of 10 if the token is "largegap" or "/"
*/
- private final class LargePosIncTokenFilter extends TokenFilter {
+ private static final class LargePosIncTokenFilter extends TokenFilter {
private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java
index f4e8b79..7516a23 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java
@@ -171,7 +171,7 @@ public class TestWordDelimiterGraphFilter extends BaseTokenStreamTestCase {
/*
* Set a large position increment gap of 10 if the token is "largegap" or "/"
*/
- private final class LargePosIncTokenFilter extends TokenFilter {
+ private static final class LargePosIncTokenFilter extends TokenFilter {
private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
index 3e54cc0..81da458 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
@@ -57,7 +57,7 @@ public class NumericPayloadTokenFilterTest extends BaseTokenStreamTestCase {
assertTrue(seenDogs + " does not equal: " + true, seenDogs == true);
}
- private final class WordTokenFilter extends TokenFilter {
+ private static final class WordTokenFilter extends TokenFilter {
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
index f901016..5333cf0 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
@@ -47,7 +47,7 @@ public class TypeAsPayloadTokenFilterTest extends BaseTokenStreamTestCase {
assertTrue(count + " does not equal: " + 10, count == 10);
}
- private final class WordTokenFilter extends TokenFilter {
+ private static final class WordTokenFilter extends TokenFilter {
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
index c0127a3..5c2c2bb 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
@@ -223,7 +223,7 @@ public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase {
}
- class ModuloTokenFilter extends TokenFilter {
+ static class ModuloTokenFilter extends TokenFilter {
int modCount;
@@ -248,7 +248,7 @@ public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase {
}
}
- class ModuloSinkFilter extends FilteringTokenFilter {
+ static class ModuloSinkFilter extends FilteringTokenFilter {
int count = 0;
int modCount;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
index 881bc2f..783b707 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
@@ -71,7 +71,7 @@ public class TestSnowball extends BaseTokenStreamTestCase {
assertEquals(new BytesRef(new byte[]{0,1,2,3}), payloadAtt.getPayload());
}
- private final class TestTokenStream extends TokenStream {
+ private static final class TestTokenStream extends TokenStream {
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
index 8d3c706..eaa5a44 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
@@ -127,7 +127,7 @@ public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase {
}
/** Passes through tokens with type "<URL>" and blocks all other types. */
- private class URLFilter extends TokenFilter {
+ private static class URLFilter extends TokenFilter {
private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
public URLFilter(TokenStream in) {
super(in);
@@ -146,7 +146,7 @@ public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase {
}
/** Passes through tokens with type "<EMAIL>" and blocks all other types. */
- private class EmailFilter extends TokenFilter {
+ private static class EmailFilter extends TokenFilter {
private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class);
public EmailFilter(TokenStream in) {
super(in);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java
index e48c4ba..bfe7c12 100644
--- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java
+++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java
@@ -112,7 +112,7 @@ public final class ICUTransformFilter extends TokenFilter {
/**
* Wrap a {@link CharTermAttribute} with the Replaceable API.
*/
- final class ReplaceableTermAttribute implements Replaceable {
+ static final class ReplaceableTermAttribute implements Replaceable {
private char buffer[];
private int length;
private CharTermAttribute token;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
index acbfe82..ccdb207 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
@@ -82,7 +82,7 @@ public class CachingNaiveBayesClassifierTest extends ClassificationTestBase<Byte
}
}
- private class NGramAnalyzer extends Analyzer {
+ private static class NGramAnalyzer extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer = new KeywordTokenizer();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
index 830ce2c..2b4873d 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
@@ -83,7 +83,7 @@ public class SimpleNaiveBayesClassifierTest extends ClassificationTestBase<Bytes
}
}
- private class NGramAnalyzer extends Analyzer {
+ private static class NGramAnalyzer extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer = new KeywordTokenizer();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
index ffe9fa1..b864bf0 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
@@ -217,8 +217,8 @@ public final class BloomFilteringPostingsFormat extends PostingsFormat {
public int size() {
return delegateFieldsProducer.size();
}
-
- class BloomFilteredTerms extends Terms {
+
+ static class BloomFilteredTerms extends Terms {
private Terms delegateTerms;
private FuzzySet filter;
@@ -288,8 +288,8 @@ public final class BloomFilteringPostingsFormat extends PostingsFormat {
return delegateTerms.getMax();
}
}
-
- final class BloomFilteredTermsEnum extends TermsEnum {
+
+ static final class BloomFilteredTermsEnum extends TermsEnum {
private Terms delegateTerms;
private TermsEnum delegateTermsEnum;
private final FuzzySet filter;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
index 1427dec..dda59a4 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
@@ -111,15 +111,11 @@ public final class MemoryPostingsFormat extends PostingsFormat {
private final FieldInfo field;
private final Builder<BytesRef> builder;
private final ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();
- private final boolean doPackFST;
- private final float acceptableOverheadRatio;
private int termCount;
public TermsWriter(IndexOutput out, FieldInfo field, boolean doPackFST, float acceptableOverheadRatio) {
this.out = out;
this.field = field;
- this.doPackFST = doPackFST;
- this.acceptableOverheadRatio = acceptableOverheadRatio;
builder = new Builder<>(FST.INPUT_TYPE.BYTE1, 0, 0, true, true, Integer.MAX_VALUE, outputs, doPackFST, acceptableOverheadRatio, true, 15);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
index c1808bf..873aaef 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
@@ -239,7 +239,7 @@ public class SimpleTextTermVectorsReader extends TermVectorsReader {
return scratchUTF16.toString();
}
- private class SimpleTVFields extends Fields {
+ private static class SimpleTVFields extends Fields {
private final SortedMap<String,SimpleTVTerms> fields;
SimpleTVFields(SortedMap<String,SimpleTVTerms> fields) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
index f0d1640..2b2cd56 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
@@ -747,7 +747,7 @@ public final class CompressingTermVectorsReader extends TermVectorsReader implem
}
- private class TVTerms extends Terms {
+ private static class TVTerms extends Terms {
private final int numTerms, flags;
private final int[] prefixLengths, suffixLengths, termFreqs, positionIndex, positions, startOffsets, lengths, payloadIndex;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
index 1b9ab48..ef867ce 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
@@ -170,7 +170,7 @@ public class ParallelLeafReader extends LeafReader {
}
// Single instance of this, per ParallelReader instance
- private final class ParallelFields extends Fields {
+ private static final class ParallelFields extends Fields {
final Map<String,Terms> fields = new TreeMap<>();
ParallelFields() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
index 772e431..e349da2 100644
--- a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
@@ -68,7 +68,7 @@ public final class ConstantScoreQuery extends Query {
* wraps a query with its own optimized top-level
* scorer (e.g. BooleanScorer) we can use that
* top-level scorer. */
- protected class ConstantBulkScorer extends BulkScorer {
+ protected static class ConstantBulkScorer extends BulkScorer {
final BulkScorer bulkScorer;
final Weight weight;
final float theScore;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
index 79783b5..c842606 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
@@ -75,7 +75,7 @@ public class TestCodecs extends LuceneTestCase {
NUM_TEST_ITER = atLeast(20);
}
- class FieldData implements Comparable<FieldData> {
+ static class FieldData implements Comparable<FieldData> {
final FieldInfo fieldInfo;
final TermData[] terms;
final boolean omitTF;
@@ -107,7 +107,7 @@ public class TestCodecs extends LuceneTestCase {
}
}
- class PositionData {
+ static class PositionData {
int pos;
BytesRef payload;
@@ -117,7 +117,7 @@ public class TestCodecs extends LuceneTestCase {
}
}
- class TermData implements Comparable<TermData> {
+ static class TermData implements Comparable<TermData> {
String text2;
final BytesRef text;
int[] docs;
@@ -300,7 +300,7 @@ public class TestCodecs extends LuceneTestCase {
dir.close();
}
- private class Verify extends Thread {
+ private static class Verify extends Thread {
final Fields termsDict;
final FieldData[] fields;
final SegmentInfo si;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
index 993a521..aa2901c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
@@ -290,7 +290,7 @@ public class TestFlushByRamOrCountsPolicy extends LuceneTestCase {
assertEquals(bytesUsed, flushControl.activeBytes());
}
- public class IndexThread extends Thread {
+ public static class IndexThread extends Thread {
IndexWriter writer;
LiveIndexWriterConfig iwc;
LineFileDocs docs;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
index 4992338..76b36bb 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
@@ -347,7 +347,7 @@ public class TestIndexWriterExceptions extends LuceneTestCase {
private static String CRASH_FAIL_MESSAGE = "I'm experiencing problems";
- private class CrashingFilter extends TokenFilter {
+ private static class CrashingFilter extends TokenFilter {
String fieldName;
int count;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
index e4d4018..6931efa 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
@@ -308,7 +308,7 @@ public class TestIndexWriterMerging extends LuceneTestCase {
// Just intercepts all merges & verifies that we are never
// merging a segment with >= 20 (maxMergeDocs) docs
- private class MyMergeScheduler extends MergeScheduler {
+ private static class MyMergeScheduler extends MergeScheduler {
@Override
synchronized public void merge(IndexWriter writer, MergeTrigger trigger, boolean newMergesFound) throws IOException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
index 6b599d2..6c950b8 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
@@ -51,7 +51,7 @@ import org.apache.lucene.util.LuceneTestCase.Slow;
public class TestIndexWriterWithThreads extends LuceneTestCase {
// Used by test cases below
- private class IndexerThread extends Thread {
+ private static class IndexerThread extends Thread {
boolean diskFull;
Throwable error;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
index 67edab9..4ef3e57 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
@@ -41,7 +41,7 @@ import org.apache.lucene.util.TestUtil;
public class TestIndexableField extends LuceneTestCase {
- private class MyField implements IndexableField {
+ private static class MyField implements IndexableField {
private final int counter;
private final IndexableFieldType fieldType = new IndexableFieldType() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
index 69a7f7f..8aa05f4 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
@@ -98,7 +98,7 @@ public class TestMaxTermFrequency extends LuceneTestCase {
/**
* Simple similarity that encodes maxTermFrequency directly as a byte
*/
- class TestSimilarity extends TFIDFSimilarity {
+ static class TestSimilarity extends TFIDFSimilarity {
@Override
public float lengthNorm(FieldInvertState state) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
index 096ce52..221c6ec 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
@@ -47,7 +47,7 @@ import org.apache.lucene.util.TestUtil;
public class TestNorms extends LuceneTestCase {
final String byteTestField = "normsTestByte";
- class CustomNormEncodingSimilarity extends TFIDFSimilarity {
+ static class CustomNormEncodingSimilarity extends TFIDFSimilarity {
@Override
public long encodeNormValue(float f) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
index 34d8afb..58ef890 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
@@ -242,7 +242,7 @@ public class TestPerSegmentDeletes extends LuceneTestCase {
return Arrays.copyOf(docs, numDocs);
}
- public class RangeMergePolicy extends MergePolicy {
+ public static class RangeMergePolicy extends MergePolicy {
boolean doMerge = false;
int start;
int length;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
index 3cd9a6a..d386f39 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
@@ -686,7 +686,7 @@ public class TestStressIndexing2 extends LuceneTestCase {
assertFalse(fieldsEnum2.hasNext());
}
- private class IndexingThread extends Thread {
+ private static class IndexingThread extends Thread {
IndexWriter w;
int base;
int range;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
index 4b2a060..76947dd 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
@@ -50,7 +50,7 @@ public class TestTermVectorsReader extends LuceneTestCase {
private FieldInfos fieldInfos = new FieldInfos(new FieldInfo[0]);
private static int TERM_FREQ = 3;
- private class TestToken implements Comparable<TestToken> {
+ private static class TestToken implements Comparable<TestToken> {
String text;
int pos;
int startOffset;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
index e7de028..eb08475 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
@@ -157,7 +157,7 @@ public class TestTransactionRollback extends LuceneTestCase {
}
// Rolls back to previous commit point
- class RollbackDeletionPolicy extends IndexDeletionPolicy {
+ static class RollbackDeletionPolicy extends IndexDeletionPolicy {
private int rollbackPoint;
public RollbackDeletionPolicy(int rollbackPoint) {
@@ -197,7 +197,7 @@ public class TestTransactionRollback extends LuceneTestCase {
}
}
- class DeleteLastCommitPolicy extends IndexDeletionPolicy {
+ static class DeleteLastCommitPolicy extends IndexDeletionPolicy {
@Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {}
@@ -222,7 +222,7 @@ public class TestTransactionRollback extends LuceneTestCase {
}
// Keeps all commit points (used to build index)
- class KeepAllDeletionPolicy extends IndexDeletionPolicy {
+ static class KeepAllDeletionPolicy extends IndexDeletionPolicy {
@Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
index 575a9bb..f30e33b 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
@@ -97,7 +97,7 @@ public class TestUniqueTermCount extends LuceneTestCase {
/**
* Simple similarity that encodes maxTermFrequency directly
*/
- class TestSimilarity extends Similarity {
+ static class TestSimilarity extends Similarity {
@Override
public long computeNorm(FieldInvertState state) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
index a9bac60..f09dfde 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
@@ -183,7 +183,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
if (VERBOSE) System.out.println(message);
}
- public class CustomSearcher extends IndexSearcher {
+ public static class CustomSearcher extends IndexSearcher {
private int switcher;
public CustomSearcher(IndexReader r, int switcher) {
@@ -212,7 +212,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
}
}
- private class RandomGen {
+ private static class RandomGen {
RandomGen(Random random) {
this.random = random;
base.set(1980, 1, 1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java
index d12caf1..6d699e8 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java
@@ -201,7 +201,7 @@ public class TestEarlyTerminatingSortingCollector extends LuceneTestCase {
}
}
- private class TestTerminatedEarlySimpleCollector extends SimpleCollector {
+ private static class TestTerminatedEarlySimpleCollector extends SimpleCollector {
private boolean collectedSomething;
public boolean collectedSomething() {
return collectedSomething;
@@ -216,7 +216,7 @@ public class TestEarlyTerminatingSortingCollector extends LuceneTestCase {
}
}
- private class TestEarlyTerminatingSortingcollectorQueryTimeout implements QueryTimeout {
+ private static class TestEarlyTerminatingSortingcollectorQueryTimeout implements QueryTimeout {
final private boolean shouldExit;
public TestEarlyTerminatingSortingcollectorQueryTimeout(boolean shouldExit) {
this.shouldExit = shouldExit;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
index 72fdc7a..f332a36 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
@@ -75,7 +75,7 @@ public class TestPrefixRandom extends LuceneTestCase {
}
/** a stupid prefix query that just blasts thru the terms */
- private class DumbPrefixQuery extends MultiTermQuery {
+ private static class DumbPrefixQuery extends MultiTermQuery {
private final BytesRef prefix;
DumbPrefixQuery(Term term) {
@@ -88,7 +88,7 @@ public class TestPrefixRandom extends LuceneTestCase {
return new SimplePrefixTermsEnum(terms.iterator(), prefix);
}
- private class SimplePrefixTermsEnum extends FilteredTermsEnum {
+ private static class SimplePrefixTermsEnum extends FilteredTermsEnum {
private final BytesRef prefix;
private SimplePrefixTermsEnum(TermsEnum tenum, BytesRef prefix) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
index a704d54..78a4352 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
@@ -102,7 +102,7 @@ public class TestRegexpRandom2 extends LuceneTestCase {
}
/** a stupid regexp query that just blasts thru the terms */
- private class DumbRegexpQuery extends MultiTermQuery {
+ private static class DumbRegexpQuery extends MultiTermQuery {
private final Automaton automaton;
DumbRegexpQuery(Term term, int flags) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
index 436acb4..6da2e9a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
@@ -88,7 +88,7 @@ public class TestSimilarityProvider extends LuceneTestCase {
assertTrue(foodocs.scoreDocs[0].score < bardocs.scoreDocs[0].score);
}
- private class ExampleSimilarityProvider extends PerFieldSimilarityWrapper {
+ private static class ExampleSimilarityProvider extends PerFieldSimilarityWrapper {
private final Similarity sim1 = new Sim1();
private final Similarity sim2 = new Sim2();
@@ -106,7 +106,7 @@ public class TestSimilarityProvider extends LuceneTestCase {
}
}
- private class Sim1 extends TFIDFSimilarity {
+ private static class Sim1 extends TFIDFSimilarity {
@Override
public long encodeNormValue(float f) {
@@ -154,7 +154,7 @@ public class TestSimilarityProvider extends LuceneTestCase {
}
}
- private class Sim2 extends TFIDFSimilarity {
+ private static class Sim2 extends TFIDFSimilarity {
@Override
public long encodeNormValue(float f) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
index 1ce1bc6..eb2553a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
@@ -153,7 +153,7 @@ public class TestTermScorer extends LuceneTestCase {
assertTrue("doc should be number 5", ts.docID() == 5);
}
- private class TestHit {
+ private static class TestHit {
public int doc;
public float score;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
index d26006c..6a02e58 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
@@ -320,7 +320,7 @@ public class TestTimeLimitingCollector extends LuceneTestCase {
}
// counting collector that can slow down at collect().
- private class MyHitCollector extends SimpleCollector {
+ private static class MyHitCollector extends SimpleCollector {
private final BitSet bits = new BitSet();
private int slowdown = 0;
private int lastDocCollected = -1;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
index fa7a3fb..c257861 100644
--- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
+++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
@@ -76,7 +76,7 @@ public class TestLockFactory extends LuceneTestCase {
}
}
- class MockLockFactory extends LockFactory {
+ static class MockLockFactory extends LockFactory {
public Map<String,Lock> locksCreated = Collections.synchronizedMap(new HashMap<String,Lock>());
@@ -87,7 +87,7 @@ public class TestLockFactory extends LuceneTestCase {
return lock;
}
- public class MockLock extends Lock {
+ public static class MockLock extends Lock {
@Override
public void close() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
index 9f56d7b..ca0f811 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
@@ -40,7 +40,7 @@ public class TestCloseableThreadLocal extends LuceneTestCase {
assertNull(ctl.get());
}
- public class InitValueThreadLocal extends CloseableThreadLocal<Object> {
+ public static class InitValueThreadLocal extends CloseableThreadLocal<Object> {
@Override
protected Object initialValue() {
return TEST_VALUE;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
index fc04c5e..a9d803b 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
@@ -266,7 +266,7 @@ public class TestQueryBuilder extends LuceneTestCase {
}
}
- private class SimpleCJKAnalyzer extends Analyzer {
+ private static class SimpleCJKAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
return new TokenStreamComponents(new SimpleCJKTokenizer());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
index 3e86100..2f76de6 100644
--- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
+++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
@@ -1467,7 +1467,7 @@ public class TestFSTs extends LuceneTestCase {
}
// used by slowcompletor
- class TwoLongs {
+ static class TwoLongs {
long a;
long b;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java
----------------------------------------------------------------------
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java
index 205a540..b80f2bd 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java
@@ -185,7 +185,7 @@ public class CollisionMap {
return memoryUsage;
}
- private class EntryIterator implements Iterator<Entry> {
+ private static class EntryIterator implements Iterator<Entry> {
Entry next; // next entry to return
int index; // current slot
Entry[] ents;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
----------------------------------------------------------------------
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
index 46141bc..c590502 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
@@ -720,7 +720,7 @@ public class GroupFacetCollectorTest extends AbstractGroupingTestCase {
return null;
}
- private class IndexContext {
+ private static class IndexContext {
final int numDocs;
final DirectoryReader indexReader;
@@ -744,7 +744,7 @@ public class GroupFacetCollectorTest extends AbstractGroupingTestCase {
}
}
- private class GroupedFacetResult {
+ private static class GroupedFacetResult {
final int totalCount;
final int totalMissingCount;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
index 08055a2..e5d7e82 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
@@ -202,7 +202,7 @@ public class TestUnifiedHighlighterExtensibility extends LuceneTestCase {
}
/** Tests maintaining extensibility/visibility of {@link org.apache.lucene.search.uhighlight.FieldHighlighter} out of package. */
- private class CustomFieldHighlighter extends FieldHighlighter {
+ private static class CustomFieldHighlighter extends FieldHighlighter {
CustomFieldHighlighter(String field, FieldOffsetStrategy fieldOffsetStrategy, BreakIterator breakIterator, PassageScorer passageScorer, int maxPassages, int maxNoHighlightPassages, PassageFormatter passageFormatter) {
super(field, fieldOffsetStrategy, breakIterator, passageScorer, maxPassages, maxNoHighlightPassages, passageFormatter);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
index ab44fed..f1e5e9e 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
@@ -268,7 +268,7 @@ public class CustomScoreQuery extends Query implements Cloneable {
/**
* A scorer that applies a (callback) function on scores of the subQuery.
*/
- private class CustomScorer extends FilterScorer {
+ private static class CustomScorer extends FilterScorer {
private final float qWeight;
private final Scorer subQueryScorer;
private final Scorer[] valSrcScorers;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
index 7f66720..bca6c42 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
@@ -153,7 +153,7 @@ public class TestCustomScoreQuery extends FunctionTestSetup {
}
}
- private final class CustomExternalQuery extends CustomScoreQuery {
+ private static final class CustomExternalQuery extends CustomScoreQuery {
@Override
protected CustomScoreProvider getCustomScoreProvider(LeafReaderContext context) throws IOException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
index 2c0204d..e19458b 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
@@ -461,7 +461,7 @@ public class TestPayloadSpans extends LuceneTestCase {
assertEquals("expected numSpans", numSpans, cnt);
}
- final class PayloadAnalyzer extends Analyzer {
+ static final class PayloadAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -470,7 +470,7 @@ public class TestPayloadSpans extends LuceneTestCase {
}
}
- final class PayloadFilter extends TokenFilter {
+ static final class PayloadFilter extends TokenFilter {
Set<String> entities = new HashSet<>();
Set<String> nopayload = new HashSet<>();
int pos;
@@ -515,7 +515,7 @@ public class TestPayloadSpans extends LuceneTestCase {
}
}
- public final class TestPayloadAnalyzer extends Analyzer {
+ public static final class TestPayloadAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
index bdb6256..85a5f39 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
@@ -120,7 +120,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase {
* Expands "multi" to "multi" and "multi2", both at the same position,
* and expands "triplemulti" to "triplemulti", "multi3", and "multi2".
*/
- private class MultiAnalyzer extends Analyzer {
+ private static class MultiAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -129,7 +129,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase {
}
}
- private final class TestFilter extends TokenFilter {
+ private static final class TestFilter extends TokenFilter {
private String prevType;
private int prevStartOffset;
@@ -191,7 +191,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase {
* Analyzes "the quick brown" as: quick(incr=2) brown(incr=1).
* Does not work correctly for input other than "the quick brown ...".
*/
- private class PosIncrementAnalyzer extends Analyzer {
+ private static class PosIncrementAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -200,7 +200,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase {
}
}
- private final class TestPosIncrementFilter extends TokenFilter {
+ private static final class TestPosIncrementFilter extends TokenFilter {
CharTermAttribute termAtt;
PositionIncrementAttribute posIncrAtt;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
index 97f14ad..4154e0c 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
@@ -337,7 +337,7 @@ public class TestMultiFieldQueryParser extends LuceneTestCase {
}
/** whitespace+lowercase analyzer with synonyms (dogs,dog) and (guinea pig,cavy) */
- private class MockSynonymAnalyzer extends Analyzer {
+ private static class MockSynonymAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
index 56ef65a..220ce02 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
@@ -139,7 +139,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase {
* Expands "multi" to "multi" and "multi2", both at the same position, and
* expands "triplemulti" to "triplemulti", "multi3", and "multi2".
*/
- private class MultiAnalyzer extends Analyzer {
+ private static class MultiAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -148,7 +148,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase {
}
}
- private final class TestFilter extends TokenFilter {
+ private static final class TestFilter extends TokenFilter {
private String prevType;
private int prevStartOffset;
@@ -206,7 +206,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase {
* Analyzes "the quick brown" as: quick(incr=2) brown(incr=1). Does not work
* correctly for input other than "the quick brown ...".
*/
- private class PosIncrementAnalyzer extends Analyzer {
+ private static class PosIncrementAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -215,7 +215,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase {
}
}
- private class TestPosIncrementFilter extends TokenFilter {
+ private static class TestPosIncrementFilter extends TokenFilter {
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
index 91b799d..253def2 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
@@ -362,7 +362,7 @@ public class TestQPHelper extends LuceneTestCase {
}
//individual CJK chars as terms, like StandardAnalyzer
- private class SimpleCJKTokenizer extends Tokenizer {
+ private static class SimpleCJKTokenizer extends Tokenizer {
private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
public SimpleCJKTokenizer() {
@@ -380,7 +380,7 @@ public class TestQPHelper extends LuceneTestCase {
}
}
- private class SimpleCJKAnalyzer extends Analyzer {
+ private static class SimpleCJKAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
return new TokenStreamComponents(new SimpleCJKTokenizer());
@@ -1277,7 +1277,7 @@ public class TestQPHelper extends LuceneTestCase {
super.tearDown();
}
- private class CannedTokenizer extends Tokenizer {
+ private static class CannedTokenizer extends Tokenizer {
private int upto = 0;
private final PositionIncrementAttribute posIncr = addAttribute(PositionIncrementAttribute.class);
private final CharTermAttribute term = addAttribute(CharTermAttribute.class);
@@ -1316,7 +1316,7 @@ public class TestQPHelper extends LuceneTestCase {
}
}
- private class CannedAnalyzer extends Analyzer {
+ private static class CannedAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String ignored) {
return new TokenStreamComponents(new CannedTokenizer());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
index edfa27e..bbececb 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
@@ -276,7 +276,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
}
}
- private class SimpleCJKAnalyzer extends Analyzer {
+ private static class SimpleCJKAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
return new TokenStreamComponents(new SimpleCJKTokenizer());
@@ -1121,7 +1121,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
}
/** whitespace+lowercase analyzer with synonyms */
- protected class Analyzer1 extends Analyzer {
+ protected static class Analyzer1 extends Analyzer {
public Analyzer1(){
super();
}
@@ -1133,7 +1133,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
}
/** whitespace+lowercase analyzer without synonyms */
- protected class Analyzer2 extends Analyzer {
+ protected static class Analyzer2 extends Analyzer {
public Analyzer2(){
super();
}
@@ -1148,7 +1148,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
/**
* Mock collation analyzer: indexes terms as "collated" + term
*/
- private class MockCollationFilter extends TokenFilter {
+ private static class MockCollationFilter extends TokenFilter {
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
protected MockCollationFilter(TokenStream input) {
@@ -1167,7 +1167,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
}
}
- private class MockCollationAnalyzer extends Analyzer {
+ private static class MockCollationAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
index 4aa0513..4f2ec27 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
@@ -110,7 +110,7 @@ public class FuzzyLikeThisQuery extends Query
this.maxNumTerms = maxNumTerms;
}
- class FieldVals
+ static class FieldVals
{
String queryString;
String fieldName;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
index ecf2ff6..af19e3d 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
@@ -72,7 +72,7 @@ public class TestPayloadSpanUtil extends LuceneTestCase {
directory.close();
}
- final class PayloadAnalyzer extends Analyzer {
+ final static class PayloadAnalyzer extends Analyzer {
@Override
public TokenStreamComponents createComponents(String fieldName) {
@@ -81,7 +81,7 @@ public class TestPayloadSpanUtil extends LuceneTestCase {
}
}
- final class PayloadFilter extends TokenFilter {
+ static final class PayloadFilter extends TokenFilter {
Set<String> entities = new HashSet<>();
Set<String> nopayload = new HashSet<>();
int pos;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
index f3cc5bd..c075ad4 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
@@ -441,7 +441,7 @@ public class WordBreakSpellChecker {
this.maxEvaluations = maxEvaluations;
}
- private class LengthThenMaxFreqComparator implements
+ private static class LengthThenMaxFreqComparator implements
Comparator<SuggestWordArrayWrapper> {
@Override
public int compare(SuggestWordArrayWrapper o1, SuggestWordArrayWrapper o2) {
@@ -455,7 +455,7 @@ public class WordBreakSpellChecker {
}
}
- private class LengthThenSumFreqComparator implements
+ private static class LengthThenSumFreqComparator implements
Comparator<SuggestWordArrayWrapper> {
@Override
public int compare(SuggestWordArrayWrapper o1, SuggestWordArrayWrapper o2) {
@@ -469,7 +469,7 @@ public class WordBreakSpellChecker {
}
}
- private class CombinationsThenFreqComparator implements
+ private static class CombinationsThenFreqComparator implements
Comparator<CombineSuggestionWrapper> {
@Override
public int compare(CombineSuggestionWrapper o1, CombineSuggestionWrapper o2) {
@@ -484,7 +484,7 @@ public class WordBreakSpellChecker {
}
}
- private class SuggestWordArrayWrapper {
+ private static class SuggestWordArrayWrapper {
final SuggestWord[] suggestWords;
final int freqMax;
final int freqSum;
@@ -502,7 +502,7 @@ public class WordBreakSpellChecker {
}
}
- private class CombineSuggestionWrapper {
+ private static class CombineSuggestionWrapper {
final CombineSuggestion combineSuggestion;
final int numCombinations;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java
index be9f208..11e5a99 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java
@@ -238,7 +238,7 @@ public class ContextQuery extends CompletionQuery {
}
}
- private class ContextCompletionWeight extends CompletionWeight {
+ private static class ContextCompletionWeight extends CompletionWeight {
private final Map<IntsRef, Float> contextMap;
private final int[] contextLengths;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
index fb876d2..5b7e714 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
@@ -105,7 +105,7 @@ public class ExternalRefSorter implements BytesRefSorter, Closeable {
* Iterate over byte refs in a file.
*/
// TODO: this class is a bit silly ... sole purpose is to "remove" Closeable from what #iterator returns:
- class ByteSequenceIterator implements BytesRefIterator {
+ static class ByteSequenceIterator implements BytesRefIterator {
private final OfflineSorter.ByteSequencesReader reader;
private BytesRef scratch;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
index 1cc89a4..d6c1a97 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
@@ -267,7 +267,7 @@ public class WFSTCompletionLookup extends Lookup implements Accountable {
return Integer.MAX_VALUE - (int)value;
}
- private final class WFSTInputIterator extends SortedInputIterator {
+ private static final class WFSTInputIterator extends SortedInputIterator {
WFSTInputIterator(Directory tempDir, String tempFileNamePrefix, InputIterator source) throws IOException {
super(tempDir, tempFileNamePrefix, source);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java
index 3e78f59..948ebeb 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java
@@ -147,17 +147,17 @@ public class JaspellLookup extends Lookup implements Accountable {
node.data = Long.valueOf(in.readLong());
}
if ((mask & LO_KID) != 0) {
- TSTNode kid = trie.new TSTNode('\0', node);
+ TSTNode kid = new TSTNode('\0', node);
node.relatives[TSTNode.LOKID] = kid;
readRecursively(in, kid);
}
if ((mask & EQ_KID) != 0) {
- TSTNode kid = trie.new TSTNode('\0', node);
+ TSTNode kid = new TSTNode('\0', node);
node.relatives[TSTNode.EQKID] = kid;
readRecursively(in, kid);
}
if ((mask & HI_KID) != 0) {
- TSTNode kid = trie.new TSTNode('\0', node);
+ TSTNode kid = new TSTNode('\0', node);
node.relatives[TSTNode.HIKID] = kid;
readRecursively(in, kid);
}
@@ -196,7 +196,7 @@ public class JaspellLookup extends Lookup implements Accountable {
@Override
public boolean load(DataInput input) throws IOException {
count = input.readVLong();
- TSTNode root = trie.new TSTNode('\0', null);
+ TSTNode root = new TSTNode('\0', null);
readRecursively(input, root);
trie.setRoot(root);
return true;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
index 15deaea..2a4a439 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
@@ -71,7 +71,7 @@ public class JaspellTernarySearchTrie implements Accountable {
/**
* An inner class of Ternary Search Trie that represents a node in the trie.
*/
- protected final class TSTNode implements Accountable {
+ protected static final class TSTNode implements Accountable {
/** Index values for accessing relatives array. */
protected final static int PARENT = 0, LOKID = 1, EQKID = 2, HIKID = 3;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
index a7e9b00..57173e2 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
@@ -411,7 +411,7 @@ public class DocumentDictionaryTest extends LuceneTestCase {
return suggestionList;
}
- private class Suggestion {
+ private static class Suggestion {
private long weight;
private BytesRef payload;
private Set<BytesRef> contexts;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
index 478358b..423e62a 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
@@ -910,7 +910,7 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase {
a.close();
}
- private class IndexDocument implements Runnable {
+ private static class IndexDocument implements Runnable {
AnalyzingInfixSuggester suggester;
String key;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
index adda0fc..165c9f2 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
@@ -1118,7 +1118,7 @@ public class FuzzySuggesterTest extends LuceneTestCase {
private static final Comparator<CharSequence> CHARSEQUENCE_COMPARATOR = new CharSequenceComparator();
- public class CompareByCostThenAlpha implements Comparator<LookupResult> {
+ public static class CompareByCostThenAlpha implements Comparator<LookupResult> {
@Override
public int compare(LookupResult a, LookupResult b) {
if (a.value > b.value) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6083982/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java
index 01791b7..312b644 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java
@@ -274,7 +274,7 @@ public abstract class BaseLockFactoryTestCase extends LuceneTestCase {
}
}
- private class SearcherThread extends Thread {
+ private static class SearcherThread extends Thread {
private Directory dir;
private int numIteration;
public boolean hitException = false;