Format all java files with google-java-formatter
Change-Id: I80f971dc359c21c0dfeaff1f42f02058ae0f4791
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/CapabilityChecker.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/CapabilityChecker.java
index ab38db2..d8e8fe5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/CapabilityChecker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/CapabilityChecker.java
@@ -25,18 +25,15 @@
private final String capabilityName;
@Inject
- CapabilityChecker(Provider<CurrentUser> userProvider,
- @PluginName String pluginName) {
+ CapabilityChecker(Provider<CurrentUser> userProvider, @PluginName String pluginName) {
this.userProvider = userProvider;
- this.capabilityName =
- String.format("%s-%s", pluginName, MonitoringCapability.ID);
+ this.capabilityName = String.format("%s-%s", pluginName, MonitoringCapability.ID);
}
public boolean canMonitor() {
if (userProvider.get().isIdentifiedUser()) {
CapabilityControl ctl = userProvider.get().getCapabilities();
- return ctl.canAdministrateServer()
- || ctl.canPerform(capabilityName);
+ return ctl.canAdministrateServer() || ctl.canPerform(capabilityName);
}
return false;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
index 39ef068..4628d8a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
@@ -17,12 +17,8 @@
import com.google.gerrit.httpd.AllRequestFilter;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import net.bull.javamelody.MonitoringFilter;
-
import java.io.IOException;
import java.util.StringJoiner;
-
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
@@ -30,6 +26,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.bull.javamelody.MonitoringFilter;
@Singleton
class GerritMonitoringFilter extends AllRequestFilter {
@@ -37,17 +34,15 @@
private final CapabilityChecker capabilityChecker;
@Inject
- GerritMonitoringFilter(JavamelodyFilter monitoring,
- CapabilityChecker capabilityChecker) {
+ GerritMonitoringFilter(JavamelodyFilter monitoring, CapabilityChecker capabilityChecker) {
this.monitoring = monitoring;
this.capabilityChecker = capabilityChecker;
}
@Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- if (!(request instanceof HttpServletRequest)
- || !(response instanceof HttpServletResponse)) {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+ if (!(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) {
chain.doFilter(request, response);
return;
}
@@ -58,8 +53,7 @@
if (canMonitor(httpRequest)) {
monitoring.doFilter(request, response, chain);
} else {
- httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN,
- "Forbidden access");
+ httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "Forbidden access");
}
}
@@ -74,8 +68,7 @@
}
private boolean canMonitor(HttpServletRequest httpRequest) {
- if (httpRequest.getRequestURI().equals(monitoring
- .getJavamelodyUrl(httpRequest))) {
+ if (httpRequest.getRequestURI().equals(monitoring.getJavamelodyUrl(httpRequest))) {
return capabilityChecker.canMonitor();
}
return true;
@@ -84,18 +77,19 @@
static class JavamelodyFilter extends MonitoringFilter {
private static String HTTP_TRANSFORM_PATTERN = "http-transform-pattern";
private static String GLOBAL_HTTP_TRANSFORM_PATTERN = "javamelody." + HTTP_TRANSFORM_PATTERN;
- static String GERRIT_GROUPING = new StringJoiner("|")
- .add("[0-9a-f]{64}") // Long SHA for LFS
- .add("[0-9a-f]{40}") // SHA-1
- .add("[0-9A-F]{32}") // GWT cache ID
- .add("(?<=files/)[^/]+") //review files part
- .add("(?<=/projects/)[^/]+") //project name
- .add("(?<=/accounts/)[^/]+") // account id
- .add("(.+)(?=/git-upload-pack)") // Git fetch/clone
- .add("(.+)(?=/git-receive-pack)") // Git push
- .add("(.+)(?=/info/)") // Git and LFS operations
- .add("\\d+") // various ids e.g. change id
- .toString();
+ static String GERRIT_GROUPING =
+ new StringJoiner("|")
+ .add("[0-9a-f]{64}") // Long SHA for LFS
+ .add("[0-9a-f]{40}") // SHA-1
+ .add("[0-9A-F]{32}") // GWT cache ID
+ .add("(?<=files/)[^/]+") // review files part
+ .add("(?<=/projects/)[^/]+") // project name
+ .add("(?<=/accounts/)[^/]+") // account id
+ .add("(.+)(?=/git-upload-pack)") // Git fetch/clone
+ .add("(.+)(?=/git-receive-pack)") // Git push
+ .add("(.+)(?=/info/)") // Git and LFS operations
+ .add("\\d+") // various ids e.g. change id
+ .toString();
@Override
public void init(FilterConfig config) throws ServletException {
@@ -113,6 +107,6 @@
return System.getProperty(GLOBAL_HTTP_TRANSFORM_PATTERN) == null
&& config.getServletContext().getInitParameter(GLOBAL_HTTP_TRANSFORM_PATTERN) == null
&& config.getInitParameter(HTTP_TRANSFORM_PATTERN) == null;
- }
+ }
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/Module.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/Module.java
index 291fbf1..0cf8701 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/Module.java
@@ -29,19 +29,17 @@
private final PluginConfig cfg;
@Inject
- public Module(PluginConfigFactory cfgFactory,
- @PluginName String pluginName) {
+ public Module(PluginConfigFactory cfgFactory, @PluginName String pluginName) {
this.cfg = cfgFactory.getFromGerritConfig(pluginName);
}
@Override
protected void configure() {
bind(CapabilityDefinition.class)
- .annotatedWith(Exports.named(MonitoringCapability.ID))
- .to(MonitoringCapability.class);
+ .annotatedWith(Exports.named(MonitoringCapability.ID))
+ .to(MonitoringCapability.class);
if (cfg.getBoolean("allowTopMenu", true)) {
- DynamicSet.bind(binder(), TopMenu.class)
- .to(MonitoringTopMenu.class);
+ DynamicSet.bind(binder(), TopMenu.class).to(MonitoringTopMenu.class);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
index dbe8d3b..ab0edd2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java
@@ -15,10 +15,8 @@
package com.googlesource.gerrit.plugins.javamelody;
import com.google.gerrit.extensions.persistence.DataSourceInterceptor;
-
-import net.bull.javamelody.JdbcWrapper;
-
import javax.sql.DataSource;
+import net.bull.javamelody.JdbcWrapper;
public class MonitoringDataSourceInterceptor implements DataSourceInterceptor {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
index 7159404..60ebf86 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
@@ -18,7 +18,6 @@
import com.google.gerrit.extensions.client.MenuItem;
import com.google.gerrit.extensions.webui.TopMenu;
import com.google.inject.Inject;
-
import java.util.Collections;
import java.util.List;
@@ -28,8 +27,9 @@
@Inject
public MonitoringTopMenu(CapabilityChecker capabilityChecker) {
if (capabilityChecker.canMonitor()) {
- menuEntries.add(new MenuEntry("Monitoring", Collections
- .singletonList(new MenuItem("JavaMelody", "monitoring"))));
+ menuEntries.add(
+ new MenuEntry(
+ "Monitoring", Collections.singletonList(new MenuItem("JavaMelody", "monitoring"))));
}
}
