diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java
index 61ed67fc87..6d3dd600bb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java
@@ -38,14 +38,13 @@ public class ExtensionPanel extends FlowPanel {
     this(extensionPoint, new ArrayList<String>());
   }
 
-  public ExtensionPanel(GerritUiExtensionPoint extensionPoint,
-       List<String> panelNames) {
+  public ExtensionPanel(GerritUiExtensionPoint extensionPoint, List<String> panelNames) {
     this.extensionPoint = extensionPoint;
     this.contexts = create(panelNames);
   }
 
   private List<Context> create(List<String> panelNames) {
-    List<Context> contexts = new ArrayList<Context>();
+    List<Context> contexts = new ArrayList<>();
     for (Definition def : getOrderedDefs(panelNames)) {
       SimplePanel p = new SimplePanel();
       add(p);
@@ -58,31 +57,28 @@ public class ExtensionPanel extends FlowPanel {
     if (panelNames == null) {
       panelNames = Collections.emptyList();
     }
-    Map<String, List<Definition>> defsOrderedByName =
-        new LinkedHashMap<String, List<Definition>>();
+    Map<String, List<Definition>> defsOrderedByName = new LinkedHashMap<>();
     for (String name : panelNames) {
       defsOrderedByName.put(name, new ArrayList<Definition>());
     }
-    for (Definition def : Natives.asList(
-        Definition.get(extensionPoint.name()))) {
+    for (Definition def : Natives.asList(Definition.get(extensionPoint.name()))) {
       addDef(def, defsOrderedByName);
     }
-    List<Definition> orderedDefs = new ArrayList<Definition>();
+    List<Definition> orderedDefs = new ArrayList<>();
     for (List<Definition> defList : defsOrderedByName.values()) {
       orderedDefs.addAll(defList);
     }
     return orderedDefs;
   }
 
-  private static void addDef(Definition def,
-      Map<String, List<Definition>> defsOrderedByName) {
+  private static void addDef(Definition def, Map<String, List<Definition>> defsOrderedByName) {
     String panelName = def.getPanelName();
     if (panelName.equals(def.getPluginName() + ".undefined")) {
-        /* Handle a partially undefined panel name from the
-           javascript layer by generating a random panel name.
-           This maintains support for panels that do not provide a name. */
-      panelName = def.getPluginName() + "." + Long.toHexString(
-          Double.doubleToLongBits(Math.random()));
+      /* Handle a partially undefined panel name from the
+      javascript layer by generating a random panel name.
+      This maintains support for panels that do not provide a name. */
+      panelName =
+          def.getPluginName() + "." + Long.toHexString(Double.doubleToLongBits(Math.random()));
     }
     if (defsOrderedByName.containsKey(panelName)) {
       defsOrderedByName.get(panelName).add(def);
@@ -163,6 +159,7 @@ public class ExtensionPanel extends FlowPanel {
     protected Definition() {}
 
     public final native String getPanelName() /*-{ return this.pluginName + "." + this.name; }-*/;
+
     public final native String getPluginName() /*-{ return this.pluginName; }-*/;
   }
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
index 1d98443633..7182b785cb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java
@@ -22,8 +22,6 @@ import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
index eb1c0d9d59..8cc2fcf217 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
@@ -558,20 +558,22 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
         loadPermissionRules(rc, ACCOUNTS, null, KEY_SAME_GROUP_VISIBILITY, groupsByName, false));
   }
 
-  private void loadExtensionPanelSections(Config rc) throws IOException {
+  private void loadExtensionPanelSections(Config rc) {
     Map<String, String> lowerNames = Maps.newHashMapWithExpectedSize(2);
     extensionPanelSections = Maps.newLinkedHashMap();
     for (String name : rc.getSubsections(EXTENSION_PANELS)) {
       String lower = name.toLowerCase();
       if (lowerNames.containsKey(lower)) {
-        error(new ValidationError(PROJECT_CONFIG, String.format(
-            "Extension Panels \"%s\" conflicts with \"%s\"",
-            name, lowerNames.get(lower))));
+        error(
+            new ValidationError(
+                PROJECT_CONFIG,
+                String.format(
+                    "Extension Panels \"%s\" conflicts with \"%s\"", name, lowerNames.get(lower))));
       }
       lowerNames.put(lower, name);
-      extensionPanelSections.put(name,
-          new ArrayList<String>(Arrays.asList(
-              rc.getStringList(EXTENSION_PANELS, name, KEY_PANEL))));
+      extensionPanelSections.put(
+          name,
+          new ArrayList<>(Arrays.asList(rc.getStringList(EXTENSION_PANELS, name, KEY_PANEL))));
     }
   }