Global reformat with google-java-format rules
Change-Id: I428687448467767f5aed1bf5f224a2b9a0d01db6
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Configuration.java
index 1045a1b..b374bde 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Configuration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Configuration.java
@@ -14,14 +14,13 @@
package com.googlesource.gerrit.plugins.webhooks;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
public class Configuration {
@@ -39,8 +38,7 @@
private final int threadPoolSize;
@Inject
- Configuration(PluginConfigFactory config,
- @PluginName String pluginName) {
+ Configuration(PluginConfigFactory config, @PluginName String pluginName) {
PluginConfig cfg = config.getFromGerritConfig(pluginName, true);
connectionTimeout = getInt(cfg, "connectionTimeout", DEFAULT_TIMEOUT_MS);
socketTimeout = getInt(cfg, "socketTimeout", DEFAULT_TIMEOUT_MS);
@@ -53,8 +51,7 @@
try {
return cfg.getInt(name, defaultValue);
} catch (IllegalArgumentException e) {
- log.error(String.format(
- "invalid value for %s; using default value %d", name, defaultValue));
+ log.error(String.format("invalid value for %s; using default value %d", name, defaultValue));
log.debug("Failed retrieve integer value: " + e.getMessage(), e);
return defaultValue;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
index b7fa69f..0b83fe1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
@@ -14,10 +14,6 @@
package com.googlesource.gerrit.plugins.webhooks;
-import org.eclipse.jgit.lib.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.base.Strings;
import com.google.common.base.Supplier;
import com.google.gerrit.common.EventListener;
@@ -30,21 +26,23 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.inject.Inject;
+import org.eclipse.jgit.lib.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class EventHandler implements EventListener {
- private static final Logger log = LoggerFactory
- .getLogger(EventHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(EventHandler.class);
- private static Gson GSON = new GsonBuilder()
- .registerTypeAdapter(Supplier.class, new SupplierSerializer())
- .create();
+ private static Gson GSON =
+ new GsonBuilder().registerTypeAdapter(Supplier.class, new SupplierSerializer()).create();
private final PluginConfigFactory configFactory;
private final String pluginName;
private final PostTask.Factory taskFactory;
@Inject
- EventHandler(PluginConfigFactory configFactory,
+ EventHandler(
+ PluginConfigFactory configFactory,
@PluginName String pluginName,
PostTask.Factory taskFactory) {
this.configFactory = configFactory;
@@ -61,11 +59,14 @@
ProjectEvent projectEvent = (ProjectEvent) event;
Config cfg;
try {
- cfg = configFactory.getProjectPluginConfigWithInheritance(
- projectEvent.getProjectNameKey(), pluginName);
+ cfg =
+ configFactory.getProjectPluginConfigWithInheritance(
+ projectEvent.getProjectNameKey(), pluginName);
} catch (NoSuchProjectException e) {
- log.warn("Ignoring event for a non-existing project {}, {}",
- projectEvent.getProjectNameKey().get(), projectEvent);
+ log.warn(
+ "Ignoring event for a non-existing project {}, {}",
+ projectEvent.getProjectNameKey().get(),
+ projectEvent);
return;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/ExecutorProvider.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/ExecutorProvider.java
index 0289422..55314b6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/ExecutorProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/ExecutorProvider.java
@@ -19,17 +19,13 @@
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Provider;
-
import java.util.concurrent.ScheduledExecutorService;
-class ExecutorProvider
- implements Provider<ScheduledExecutorService>, LifecycleListener {
+class ExecutorProvider implements Provider<ScheduledExecutorService>, LifecycleListener {
private ScheduledExecutorService executor;
@Inject
- ExecutorProvider(WorkQueue workQueue,
- Configuration cfg,
- @PluginName String name) {
+ ExecutorProvider(WorkQueue workQueue, Configuration cfg, @PluginName String name) {
executor = workQueue.createQueue(cfg.getThreadPoolSize(), name);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpClientProvider.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpClientProvider.java
index d045fd5..3cbbe2a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpClientProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpClientProvider.java
@@ -14,14 +14,14 @@
package com.googlesource.gerrit.plugins.webhooks;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
-
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.ServiceUnavailableRetryStrategy;
import org.apache.http.client.config.RequestConfig;
@@ -39,15 +39,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-/**
- * Provides an HTTP client with SSL capabilities.
- */
+/** Provides an HTTP client with SSL capabilities. */
class HttpClientProvider implements Provider<CloseableHttpClient> {
- private static final Logger log = LoggerFactory
- .getLogger(HttpClientProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(HttpClientProvider.class);
private static final int CONNECTIONS_PER_ROUTE = 100;
// Up to 2 target instances with the max number of connections per host:
private static final int MAX_CONNECTIONS = 2 * CONNECTIONS_PER_ROUTE;
@@ -65,7 +59,8 @@
@Override
public CloseableHttpClient get() {
- return HttpClients.custom().setSSLSocketFactory(sslSocketFactory)
+ return HttpClients.custom()
+ .setSSLSocketFactory(sslSocketFactory)
.setConnectionManager(customConnectionManager())
.setDefaultRequestConfig(customRequestConfig())
.setServiceUnavailableRetryStrategy(customServiceUnavailRetryStrategy())
@@ -73,7 +68,8 @@
}
private RequestConfig customRequestConfig() {
- return RequestConfig.custom().setConnectTimeout(cfg.getConnectionTimeout())
+ return RequestConfig.custom()
+ .setConnectTimeout(cfg.getConnectionTimeout())
.setSocketTimeout(cfg.getSocketTimeout())
.setConnectionRequestTimeout(cfg.getConnectionTimeout())
.build();
@@ -82,8 +78,7 @@
private ServiceUnavailableRetryStrategy customServiceUnavailRetryStrategy() {
return new ServiceUnavailableRetryStrategy() {
@Override
- public boolean retryRequest(HttpResponse response, int executionCount,
- HttpContext context) {
+ public boolean retryRequest(HttpResponse response, int executionCount, HttpContext context) {
if (executionCount > cfg.getMaxTries()) {
return false;
}
@@ -102,16 +97,22 @@
}
private void logRetry(String cause, HttpContext context) {
- if (log.isDebugEnabled()){
- log.debug("Retrying request caused by '" + cause + "', request: '"
- + context.getAttribute("http.request") + "'");
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "Retrying request caused by '"
+ + cause
+ + "', request: '"
+ + context.getAttribute("http.request")
+ + "'");
}
}
private HttpClientConnectionManager customConnectionManager() {
- Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder
- .<ConnectionSocketFactory> create().register("https", sslSocketFactory)
- .register("http", PlainConnectionSocketFactory.INSTANCE).build();
+ Registry<ConnectionSocketFactory> socketFactoryRegistry =
+ RegistryBuilder.<ConnectionSocketFactory>create()
+ .register("https", sslSocketFactory)
+ .register("http", PlainConnectionSocketFactory.INSTANCE)
+ .build();
PoolingHttpClientConnectionManager connManager =
new PoolingHttpClientConnectionManager(socketFactoryRegistry);
connManager.setDefaultMaxPerRoute(CONNECTIONS_PER_ROUTE);
@@ -121,14 +122,12 @@
}
private SSLConnectionSocketFactory buildSslSocketFactory() {
- return new SSLConnectionSocketFactory(buildSslContext(),
- NoopHostnameVerifier.INSTANCE);
+ return new SSLConnectionSocketFactory(buildSslContext(), NoopHostnameVerifier.INSTANCE);
}
private SSLContext buildSslContext() {
try {
- TrustManager[] trustAllCerts =
- new TrustManager[] {new DummyX509TrustManager()};
+ TrustManager[] trustAllCerts = new TrustManager[] {new DummyX509TrustManager()};
SSLContext context = SSLContext.getInstance("TLS");
context.init(null, trustAllCerts, null);
return context;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpResponseHandler.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpResponseHandler.java
index 8654eed..994d337 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpResponseHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpResponseHandler.java
@@ -18,7 +18,7 @@
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.googlesource.gerrit.plugins.webhooks.HttpResponseHandler.HttpResult;
-
+import java.io.IOException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.ResponseHandler;
@@ -26,8 +26,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
class HttpResponseHandler implements ResponseHandler<HttpResult> {
static class HttpResult {
@@ -40,8 +38,7 @@
}
}
- private static final Logger log =
- LoggerFactory.getLogger(HttpResponseHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(HttpResponseHandler.class);
@Override
public HttpResult handleResponse(HttpResponse response) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
index 14c2edf..8809f4d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/HttpSession.java
@@ -14,16 +14,14 @@
package com.googlesource.gerrit.plugins.webhooks;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-
import com.google.common.net.MediaType;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.webhooks.HttpResponseHandler.HttpResult;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
class HttpSession {
private final CloseableHttpClient httpClient;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
index 88e9637..71336e9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
@@ -14,14 +14,12 @@
package com.googlesource.gerrit.plugins.webhooks;
-
-import org.apache.http.impl.client.CloseableHttpClient;
-
import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.inject.Scopes;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.http.impl.client.CloseableHttpClient;
public class Module extends FactoryModule {
@@ -31,8 +29,7 @@
.annotatedWith(WebHooksExecutor.class)
.toProvider(ExecutorProvider.class);
bind(Configuration.class).in(Scopes.SINGLETON);
- bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class)
- .in(Scopes.SINGLETON);
+ bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class).in(Scopes.SINGLETON);
factory(PostTask.Factory.class);
DynamicSet.bind(binder(), EventListener.class).to(EventHandler.class);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/PostTask.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/PostTask.java
index efb24f1..eeb6d46 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/PostTask.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/PostTask.java
@@ -14,22 +14,18 @@
package com.googlesource.gerrit.plugins.webhooks;
-import java.io.IOException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import com.googlesource.gerrit.plugins.webhooks.HttpResponseHandler.HttpResult;
+import java.io.IOException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class PostTask implements Runnable {
- private static final Logger log = LoggerFactory
- .getLogger(PostTask.class);
+ private static final Logger log = LoggerFactory.getLogger(PostTask.class);
interface Factory {
PostTask create(@Assisted("url") String url, @Assisted("body") String body);
@@ -43,7 +39,8 @@
private int execCnt;
@AssistedInject
- public PostTask(@WebHooksExecutor ScheduledExecutorService executor,
+ public PostTask(
+ @WebHooksExecutor ScheduledExecutorService executor,
HttpSession session,
Configuration cfg,
@Assisted("url") String url,
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/WebHooksExecutor.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/WebHooksExecutor.java
index 45b25cd..f3254ae 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/WebHooksExecutor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/WebHooksExecutor.java
@@ -16,11 +16,9 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Retention;
-
import com.google.inject.BindingAnnotation;
+import java.lang.annotation.Retention;
@Retention(RUNTIME)
@BindingAnnotation
-@interface WebHooksExecutor {
-}
+@interface WebHooksExecutor {}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/webhooks/EventHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/webhooks/EventHandlerTest.java
index e9965db..7dae524 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/webhooks/EventHandlerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/webhooks/EventHandlerTest.java
@@ -20,13 +20,6 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import org.eclipse.jgit.lib.Config;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.Project.NameKey;
import com.google.gerrit.server.config.PluginConfigFactory;
@@ -34,6 +27,12 @@
import com.google.gerrit.server.events.ProjectCreatedEvent;
import com.google.gerrit.server.events.RefUpdatedEvent;
import com.google.gerrit.server.project.NoSuchProjectException;
+import org.eclipse.jgit.lib.Config;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class EventHandlerTest {
@@ -47,26 +46,25 @@
private static final String FOO_URL = "foo-url";
private static final String EVENT = "event";
- private static final ProjectCreatedEvent PROJECT_CREATED = new ProjectCreatedEvent() {
- public NameKey getProjectNameKey() {
- return PROJECT_NAME;
- }
- };
+ private static final ProjectCreatedEvent PROJECT_CREATED =
+ new ProjectCreatedEvent() {
+ public NameKey getProjectNameKey() {
+ return PROJECT_NAME;
+ }
+ };
- private static final RefUpdatedEvent REF_UPDATED = new RefUpdatedEvent() {
- public NameKey getProjectNameKey() {
- return PROJECT_NAME;
- }
- };
+ private static final RefUpdatedEvent REF_UPDATED =
+ new RefUpdatedEvent() {
+ public NameKey getProjectNameKey() {
+ return PROJECT_NAME;
+ }
+ };
- @Mock
- private PluginConfigFactory configFactory;
+ @Mock private PluginConfigFactory configFactory;
- @Mock
- private PostTask.Factory taskFactory;
+ @Mock private PostTask.Factory taskFactory;
- @Mock
- private PostTask postTask;
+ @Mock private PostTask postTask;
private Config config = new Config();
@@ -117,8 +115,7 @@
public void nonProjectEventNotPosted() {
config.setString(REMOTE, FOO, URL, FOO_URL);
- Event nonProjectEvent = new Event("non-project-event") {
- };
+ Event nonProjectEvent = new Event("non-project-event") {};
eventHandler.onEvent(nonProjectEvent);
verifyZeroInteractions(postTask);
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/webhooks/PostTaskTest.java b/src/test/java/com/googlesource/gerrit/plugins/webhooks/PostTaskTest.java
index 185e786..cf41a4d 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/webhooks/PostTaskTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/webhooks/PostTaskTest.java
@@ -19,12 +19,11 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
+import com.googlesource.gerrit.plugins.webhooks.HttpResponseHandler.HttpResult;
import java.io.IOException;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-
import javax.net.ssl.SSLException;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,8 +32,6 @@
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import com.googlesource.gerrit.plugins.webhooks.HttpResponseHandler.HttpResult;
-
@RunWith(MockitoJUnitRunner.class)
public class PostTaskTest {
@@ -45,14 +42,11 @@
private static final int RETRY_INTERVAL = 100;
private static final int MAX_TRIES = 3;
- @Mock
- private Configuration cfg;
+ @Mock private Configuration cfg;
- @Mock
- private HttpSession session;
+ @Mock private HttpSession session;
- @Mock
- private ScheduledThreadPoolExecutor executor;
+ @Mock private ScheduledThreadPoolExecutor executor;
private PostTask task;
@@ -60,8 +54,7 @@
public void setup() {
when(cfg.getRetryInterval()).thenReturn(RETRY_INTERVAL);
when(cfg.getMaxTries()).thenReturn(MAX_TRIES);
- task = new PostTask(
- executor, session, cfg, WEBHOOK_URL, BODY);
+ task = new PostTask(executor, session, cfg, WEBHOOK_URL, BODY);
}
@Test
@@ -96,13 +89,14 @@
public void keepReschedulingMaxTriesTimes() throws IOException {
when(session.post(WEBHOOK_URL, BODY)).thenThrow(IOException.class);
when(executor.schedule(task, RETRY_INTERVAL, TimeUnit.MILLISECONDS))
- .then(new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Throwable {
- task.run();
- return null;
- }
- });
+ .then(
+ new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ task.run();
+ return null;
+ }
+ });
task.run();
verify(executor, times(MAX_TRIES - 1)).schedule(task, RETRY_INTERVAL, TimeUnit.MILLISECONDS);
}
