opendev/gerrit
Code Issues Proposed changes

Merge "Clean up various CheckStyle warnings"

Browse Source
This commit is contained in:
Edwin Kempin 2016-05-17 09:20:37 +00:00 committed by Gerrit Code Review
commit 251443314d
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/net/codemirror/addon/Addons.java vendored
View File

@ -20,7 +20,7 @@ import com.google.gwt.resources.client.DataResource;
import com.google.gwt.resources.client.DataResource.DoNotEmbed; import com.google.gwt.resources.client.DataResource.DoNotEmbed;
public interface Addons extends ClientBundle { public interface Addons extends ClientBundle {
public static final Addons I = GWT.create(Addons.class); Addons I = GWT.create(Addons.class);
@Source("merge_bundled.js") @DoNotEmbed DataResource merge_bundled(); @Source("merge_bundled.js") @DoNotEmbed DataResource merge_bundled();
} }

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/VersionedAuthorizedKeysOnInit.java
View File

@ -49,7 +49,7 @@ import java.nio.file.Path;
import java.util.List; import java.util.List;
public class VersionedAuthorizedKeysOnInit extends VersionedMetaData { public class VersionedAuthorizedKeysOnInit extends VersionedMetaData {
public static interface Factory { public interface Factory {
VersionedAuthorizedKeysOnInit create(Account.Id accountId); VersionedAuthorizedKeysOnInit create(Account.Id accountId);
} }

3
gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
View File

@ -64,9 +64,10 @@ public class DeleteWatchedProjects
if (input != null) { if (input != null) {
List<AccountProjectWatch.Key> keysToDelete = new LinkedList<>(); List<AccountProjectWatch.Key> keysToDelete = new LinkedList<>();
for (String projectKeyToDelete : input) { for (String projectKeyToDelete : input) {
if (!watchedProjectsMap.containsKey(projectKeyToDelete)) if (!watchedProjectsMap.containsKey(projectKeyToDelete)) {
throw new UnprocessableEntityException(projectKeyToDelete throw new UnprocessableEntityException(projectKeyToDelete
+ " is not currently watched by this user."); + " is not currently watched by this user.");
}
keysToDelete.add(watchedProjectsMap.get(projectKeyToDelete).getKey()); keysToDelete.add(watchedProjectsMap.get(projectKeyToDelete).getKey());
} }
dbProvider.get().accountProjectWatches().deleteKeys(keysToDelete); dbProvider.get().accountProjectWatches().deleteKeys(keysToDelete);

2
gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
View File

@ -165,7 +165,7 @@ public class VersionedAuthorizedKeys extends VersionedMetaData
} }
} }
public static interface Factory { public interface Factory {
VersionedAuthorizedKeys create(Account.Id accountId); VersionedAuthorizedKeys create(Account.Id accountId);
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteReviewerSender.java
View File

@ -34,7 +34,7 @@ import java.util.Set;
public class DeleteReviewerSender extends ReplyToChangeSender { public class DeleteReviewerSender extends ReplyToChangeSender {
private final Set<Account.Id> reviewers = new HashSet<>(); private final Set<Account.Id> reviewers = new HashSet<>();
public static interface Factory extends public interface Factory extends
ReplyToChangeSender.Factory<DeleteReviewerSender> { ReplyToChangeSender.Factory<DeleteReviewerSender> {
@Override @Override
DeleteReviewerSender create(Project.NameKey project, Change.Id change); DeleteReviewerSender create(Project.NameKey project, Change.Id change);

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
View File

@ -515,7 +515,7 @@ public class ChangeBundle {
* messages below. * messages below.
*/ */
@AutoValue @AutoValue
static abstract class ChangeMessageCandidate { abstract static class ChangeMessageCandidate {
static ChangeMessageCandidate create(ChangeMessage cm) { static ChangeMessageCandidate create(ChangeMessage cm) {
return new AutoValue_ChangeBundle_ChangeMessageCandidate( return new AutoValue_ChangeBundle_ChangeMessageCandidate(
cm.getAuthor(), cm.getAuthor(),

6
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@ -844,7 +844,7 @@ public class ChangeData {
* @throws OrmException an error occurred reading the database. * @throws OrmException an error occurred reading the database.
*/ */
public Collection<PatchSet> visiblePatchSets() throws OrmException { public Collection<PatchSet> visiblePatchSets() throws OrmException {
return FluentIterable.from(patchSets()).filter(new Predicate<PatchSet>() { Predicate<PatchSet> predicate = new Predicate<PatchSet>() {
@Override @Override
public boolean apply(PatchSet input) { public boolean apply(PatchSet input) {
try { try {
@ -852,7 +852,9 @@ public class ChangeData {
} catch (OrmException e) { } catch (OrmException e) {
return false; return false;
} }
}}).toList(); }
};
return FluentIterable.from(patchSets()).filter(predicate).toList();
} }
public void setPatchSets(Collection<PatchSet> patchSets) { public void setPatchSets(Collection<PatchSet> patchSets) {