Turn on many more Eclipse warnings, and fix them
- Warn on empty statements, e.g. "for (;;);". These may be typos and are easily replaced by "for (;;) {}" which is more explicit. - Warn on field hiding. This allows cleanup of many acceptance test members, at the cost of a couple of renames and the occasional suppression (when the field is in a public nested enum that shadows a public constant). - Warn on unnecessary casts. - Warn on unused declared thrown exceptions. In addition to reducing method signature length and number of imports, this also eliminated some impossible catch blocks. - Warn on missing @Override annotations. - Warn on unused parameters. This is likely the most controversial, as a few relatively common patterns require unused parameters in a way that Eclipse can't ignore. However, it also resulted in cleanup of a lot of unnecessary injections and method parameters, so I think the cost was worth it. Change-Id: I7224be8b1c798613a127c88507e8cce400679e5d
This commit is contained in:
@@ -483,22 +483,17 @@ public class LuceneChangeIndex implements ChangeIndex {
|
||||
return cd;
|
||||
}
|
||||
|
||||
private Document toDocument(ChangeData cd) throws IOException {
|
||||
try {
|
||||
Document result = new Document();
|
||||
for (Values<ChangeData> vs : schema.buildFields(cd, fillArgs)) {
|
||||
if (vs.getValues() != null) {
|
||||
add(result, vs);
|
||||
}
|
||||
private Document toDocument(ChangeData cd) {
|
||||
Document result = new Document();
|
||||
for (Values<ChangeData> vs : schema.buildFields(cd, fillArgs)) {
|
||||
if (vs.getValues() != null) {
|
||||
add(result, vs);
|
||||
}
|
||||
return result;
|
||||
} catch (OrmException e) {
|
||||
throw new IOException(e);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void add(Document doc, Values<ChangeData> values)
|
||||
throws OrmException {
|
||||
private void add(Document doc, Values<ChangeData> values) {
|
||||
String name = values.getField().getName();
|
||||
FieldType<?> type = values.getField().getType();
|
||||
Store store = store(values.getField());
|
||||
@@ -517,7 +512,7 @@ public class LuceneChangeIndex implements ChangeIndex {
|
||||
if (legacy) {
|
||||
for (Object value : values.getValues()) {
|
||||
int t = queryBuilder.toIndexTimeInMinutes((Timestamp) value);
|
||||
doc.add(new IntField(name, (int) t, store));
|
||||
doc.add(new IntField(name, t, store));
|
||||
}
|
||||
} else {
|
||||
for (Object value : values.getValues()) {
|
||||
|
@@ -16,7 +16,6 @@ package com.google.gerrit.lucene;
|
||||
|
||||
import com.google.gerrit.extensions.events.LifecycleListener;
|
||||
import com.google.gerrit.lifecycle.LifecycleModule;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gerrit.server.index.ChangeSchemas;
|
||||
import com.google.gerrit.server.index.IndexCollection;
|
||||
import com.google.gerrit.server.index.IndexModule;
|
||||
@@ -69,8 +68,7 @@ public class LuceneIndexModule extends LifecycleModule {
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
LuceneChangeIndex getIndex(LuceneChangeIndex.Factory factory,
|
||||
SitePaths sitePaths) {
|
||||
LuceneChangeIndex getIndex(LuceneChangeIndex.Factory factory) {
|
||||
Schema<ChangeData> schema = singleVersion != null
|
||||
? ChangeSchemas.get(singleVersion)
|
||||
: ChangeSchemas.getLatest();
|
||||
|
Reference in New Issue
Block a user