Merge branch 'stable-2.13'
* stable-2.13:
Format all Java files with google-java-format
Change-Id: I95ae0817458bed8692e095ab768293837e49eeb2
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
index 19ffb16..94a5945 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -14,9 +14,6 @@
package com.ericsson.gerrit.plugins.highavailability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import com.google.gerrit.extensions.annotations.PluginName;
@@ -24,6 +21,8 @@
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 {
@@ -45,8 +44,7 @@
private final int cacheThreadPoolSize;
@Inject
- Configuration(PluginConfigFactory config,
- @PluginName String pluginName) {
+ Configuration(PluginConfigFactory config, @PluginName String pluginName) {
PluginConfig cfg = config.getFromGerritConfig(pluginName, true);
url = Strings.nullToEmpty(cfg.getString("url"));
user = Strings.nullToEmpty(cfg.getString("user"));
@@ -55,18 +53,15 @@
socketTimeout = getInt(cfg, "socketTimeout", DEFAULT_TIMEOUT_MS);
maxTries = getInt(cfg, "maxTries", DEFAULT_MAX_TRIES);
retryInterval = getInt(cfg, "retryInterval", DEFAULT_RETRY_INTERVAL);
- indexThreadPoolSize =
- getInt(cfg, "indexThreadPoolSize", DEFAULT_THREAD_POOL_SIZE);
- cacheThreadPoolSize =
- getInt(cfg, "cacheThreadPoolSize", DEFAULT_THREAD_POOL_SIZE);
+ indexThreadPoolSize = getInt(cfg, "indexThreadPoolSize", DEFAULT_THREAD_POOL_SIZE);
+ cacheThreadPoolSize = getInt(cfg, "cacheThreadPoolSize", DEFAULT_THREAD_POOL_SIZE);
}
private int getInt(PluginConfig cfg, String name, int defaultValue) {
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/ericsson/gerrit/plugins/highavailability/ExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/ExecutorProvider.java
index 0a87074..9a91fcf 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/ExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/ExecutorProvider.java
@@ -17,15 +17,13 @@
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Provider;
-
import java.util.concurrent.ScheduledThreadPoolExecutor;
public abstract class ExecutorProvider
implements Provider<ScheduledThreadPoolExecutor>, LifecycleListener {
private WorkQueue.Executor executor;
- protected ExecutorProvider(WorkQueue workQueue, int threadPoolSize,
- String threadNamePrefix) {
+ protected ExecutorProvider(WorkQueue workQueue, int threadPoolSize, String threadNamePrefix) {
executor = workQueue.createQueue(threadPoolSize, threadNamePrefix);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
index 6ccbae2..1ff0344 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/HttpModule.java
@@ -14,10 +14,9 @@
package com.ericsson.gerrit.plugins.highavailability;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
-
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderServletModule;
import com.ericsson.gerrit.plugins.highavailability.websession.file.FileBasedWebsessionModule;
+import com.google.gerrit.httpd.plugins.HttpPluginModule;
class HttpModule extends HttpPluginModule {
@Override
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
index a9efadb..f547260 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Module.java
@@ -14,6 +14,11 @@
package com.ericsson.gerrit.plugins.highavailability;
+import com.ericsson.gerrit.plugins.highavailability.cache.CacheModule;
+import com.ericsson.gerrit.plugins.highavailability.event.EventModule;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderModule;
+import com.ericsson.gerrit.plugins.highavailability.index.IndexModule;
+import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfoModule;
import com.google.common.base.Strings;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.config.PluginConfigFactory;
@@ -22,13 +27,6 @@
import com.google.inject.ProvisionException;
import com.google.inject.Scopes;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.cache.CacheModule;
-import com.ericsson.gerrit.plugins.highavailability.event.EventModule;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.RestForwarderModule;
-import com.ericsson.gerrit.plugins.highavailability.index.IndexModule;
-import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfoModule;
-
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -49,11 +47,10 @@
@Provides
@Singleton
@SharedDirectory
- Path getSharedDirectory(PluginConfigFactory cfg,
- @PluginName String pluginName)
+ Path getSharedDirectory(PluginConfigFactory cfg, @PluginName String pluginName)
throws IOException {
- String sharedDirectory = Strings.emptyToNull(
- cfg.getFromGerritConfig(pluginName, true).getString("sharedDirectory"));
+ String sharedDirectory =
+ Strings.emptyToNull(cfg.getFromGerritConfig(pluginName, true).getString("sharedDirectory"));
if (sharedDirectory == null) {
throw new ProvisionException("sharedDirectory must be configured");
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/SharedDirectory.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/SharedDirectory.java
index 211b0e1..43ddf81 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/SharedDirectory.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/SharedDirectory.java
@@ -17,14 +17,12 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
/**
- * {@link java.nio.file.Path} to a directory accessible from both master
- * instances.
- * <p>
- * Example of usage:
+ * {@link java.nio.file.Path} to a directory accessible from both master instances.
+ *
+ * <p>Example of usage:
*
* <pre>
* {@literal @Inject}
@@ -35,5 +33,4 @@
*/
@Retention(RUNTIME)
@BindingAnnotation
-public @interface SharedDirectory {
-}
+public @interface SharedDirectory {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionHandler.java
index 8d62c7e..7e32689 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionHandler.java
@@ -14,14 +14,12 @@
package com.ericsson.gerrit.plugins.highavailability.cache;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.google.common.cache.RemovalNotification;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.cache.CacheRemovalListener;
import com.google.inject.Inject;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-
import java.util.concurrent.Executor;
import java.util.regex.Pattern;
@@ -32,21 +30,20 @@
private final Pattern pattern;
@Inject
- CacheEvictionHandler(Forwarder forwarder,
- @CacheExecutor Executor executor,
- @PluginName String pluginName) {
+ CacheEvictionHandler(
+ Forwarder forwarder, @CacheExecutor Executor executor, @PluginName String pluginName) {
this.forwarder = forwarder;
this.executor = executor;
this.pluginName = pluginName;
- pattern = Pattern.compile(
- "^accounts.*|^groups.*|ldap_groups|ldap_usernames|^project.*|sshkeys|web_sessions");
+ pattern =
+ Pattern.compile(
+ "^accounts.*|^groups.*|ldap_groups|ldap_usernames|^project.*|sshkeys|web_sessions");
}
@Override
- public void onRemoval(String pluginName, String cacheName,
- RemovalNotification<K, V> notification) {
- if (!Context.isForwardedEvent() && !notification.wasEvicted()
- && isSynchronized(cacheName)) {
+ public void onRemoval(
+ String pluginName, String cacheName, RemovalNotification<K, V> notification) {
+ if (!Context.isForwardedEvent() && !notification.wasEvicted() && isSynchronized(cacheName)) {
executor.execute(new CacheEvictionTask(cacheName, notification.getKey()));
}
}
@@ -72,8 +69,7 @@
@Override
public String toString() {
return String.format(
- "[%s] Evict key '%s' from cache '%s' in target instance", pluginName,
- key, cacheName);
+ "[%s] Evict key '%s' from cache '%s' in target instance", pluginName, key, cacheName);
}
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutor.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutor.java
index bd3dd40..52b854e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutor.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutor.java
@@ -17,10 +17,8 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
@Retention(RUNTIME)
@BindingAnnotation
-@interface CacheExecutor {
-}
+@interface CacheExecutor {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProvider.java
index 98324a9..dd40155 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProvider.java
@@ -14,20 +14,17 @@
package com.ericsson.gerrit.plugins.highavailability.cache;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
-
@Singleton
class CacheExecutorProvider extends ExecutorProvider {
@Inject
- CacheExecutorProvider(WorkQueue workQueue,
- Configuration config) {
- super(workQueue, config.getCacheThreadPoolSize(),
- "Forward-cache-eviction-event");
+ CacheExecutorProvider(WorkQueue workQueue, Configuration config) {
+ super(workQueue, config.getCacheThreadPoolSize(), "Forward-cache-eviction-event");
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheModule.java
index 6bb245b..570f981 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheModule.java
@@ -17,18 +17,14 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.cache.CacheRemovalListener;
-
import java.util.concurrent.Executor;
public class CacheModule extends LifecycleModule {
@Override
protected void configure() {
- bind(Executor.class)
- .annotatedWith(CacheExecutor.class)
- .toProvider(CacheExecutorProvider.class);
+ bind(Executor.class).annotatedWith(CacheExecutor.class).toProvider(CacheExecutorProvider.class);
listener().to(CacheExecutorProvider.class);
- DynamicSet.bind(binder(), CacheRemovalListener.class).to(
- CacheEvictionHandler.class);
+ DynamicSet.bind(binder(), CacheRemovalListener.class).to(CacheEvictionHandler.class);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/Constants.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/Constants.java
index 12f92bd..6b047d3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/Constants.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/cache/Constants.java
@@ -23,6 +23,5 @@
public static final String GROUPS_MEMBERS = "groups_members";
public static final String PROJECTS = "projects";
- private Constants() {
- }
+ private Constants() {}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutor.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutor.java
index b204220..291708c 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutor.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutor.java
@@ -17,10 +17,8 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
@Retention(RUNTIME)
@BindingAnnotation
-@interface EventExecutor {
-}
+@interface EventExecutor {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProvider.java
index 29af0ea..d9b2ae2 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProvider.java
@@ -14,12 +14,11 @@
package com.ericsson.gerrit.plugins.highavailability.event;
+import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
-
@Singleton
class EventExecutorProvider extends ExecutorProvider {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
index 0b671d1..7283737 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandler.java
@@ -14,15 +14,13 @@
package com.ericsson.gerrit.plugins.highavailability.event;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.inject.Inject;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-
import java.util.concurrent.Executor;
class EventHandler implements EventListener {
@@ -31,9 +29,8 @@
private final String pluginName;
@Inject
- EventHandler(Forwarder forwarder,
- @EventExecutor Executor executor,
- @PluginName String pluginName) {
+ EventHandler(
+ Forwarder forwarder, @EventExecutor Executor executor, @PluginName String pluginName) {
this.forwarder = forwarder;
this.executor = executor;
this.pluginName = pluginName;
@@ -60,8 +57,7 @@
@Override
public String toString() {
- return String.format("[%s] Send event '%s' to target instance",
- pluginName, event.type);
+ return String.format("[%s] Send event '%s' to target instance", pluginName, event.type);
}
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
index 3fce10f..5de02fa 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/EventModule.java
@@ -19,16 +19,13 @@
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
-
import java.util.concurrent.Executor;
public class EventModule extends LifecycleModule {
@Override
protected void configure() {
- bind(Executor.class)
- .annotatedWith(EventExecutor.class)
- .toProvider(EventExecutorProvider.class);
+ bind(Executor.class).annotatedWith(EventExecutor.class).toProvider(EventExecutorProvider.class);
listener().to(EventExecutorProvider.class);
DynamicSet.bind(binder(), EventListener.class).to(EventHandler.class);
DynamicItem.bind(binder(), EventDispatcher.class).to(ForwardedAwareEventBroker.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
index e099343..0a87503 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBroker.java
@@ -14,6 +14,7 @@
package com.ericsson.gerrit.plugins.highavailability.event;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.gerrit.common.EventBroker;
import com.google.gerrit.common.EventListener;
import com.google.gerrit.common.UserScopedEventListener;
@@ -25,18 +26,16 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
class ForwardedAwareEventBroker extends EventBroker {
@Inject
- ForwardedAwareEventBroker(DynamicSet<UserScopedEventListener> listeners,
+ ForwardedAwareEventBroker(
+ DynamicSet<UserScopedEventListener> listeners,
DynamicSet<EventListener> unrestrictedListeners,
ProjectCache projectCache,
Factory notesFactory,
Provider<ReviewDb> dbProvider) {
- super(listeners, unrestrictedListeners, projectCache, notesFactory,
- dbProvider);
+ super(listeners, unrestrictedListeners, projectCache, notesFactory, dbProvider);
}
@Override
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Context.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Context.java
index 3651e73..35049ba 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Context.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Context.java
@@ -14,9 +14,7 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder;
-/**
- * Allows to tag a forwarded event to avoid infinitely looping events.
- */
+/** Allows to tag a forwarded event to avoid infinitely looping events. */
public class Context {
private static final ThreadLocal<Boolean> FORWARDED_EVENT =
new ThreadLocal<Boolean>() {
@@ -26,8 +24,7 @@
}
};
- private Context() {
- }
+ private Context() {}
public static Boolean isForwardedEvent() {
return FORWARDED_EVENT.get();
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
index 1608042..99dff1d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/Forwarder.java
@@ -16,9 +16,7 @@
import com.google.gerrit.server.events.Event;
-/**
- * Forward indexing, stream events and cache evictions to the other master
- */
+/** Forward indexing, stream events and cache evictions to the other master */
public interface Forwarder {
/**
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
index ed5e593..b388b0b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
@@ -17,33 +17,28 @@
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.common.base.Splitter;
import com.google.common.cache.Cache;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.util.List;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class CacheRestApiServlet extends HttpServlet {
private static final int CACHENAME_INDEX = 1;
private static final long serialVersionUID = -1L;
private static final String GERRIT = "gerrit";
- private static final Logger logger =
- LoggerFactory.getLogger(CacheRestApiServlet.class);
+ private static final Logger logger = LoggerFactory.getLogger(CacheRestApiServlet.class);
private final DynamicMap<Cache<?, ?>> cacheMap;
@@ -74,8 +69,7 @@
}
}
- private static void sendError(HttpServletResponse rsp, int statusCode,
- String message) {
+ private static void sendError(HttpServletResponse rsp, int statusCode, String message) {
try {
rsp.sendError(statusCode, message);
} catch (IOException e) {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
index eb8e53e..677d2eb 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServlet.java
@@ -20,6 +20,7 @@
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.common.base.Supplier;
import com.google.common.io.CharStreams;
import com.google.common.net.MediaType;
@@ -32,24 +33,18 @@
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class EventRestApiServlet extends HttpServlet {
private static final long serialVersionUID = -1L;
- private static final Logger logger = LoggerFactory
- .getLogger(EventRestApiServlet.class);
+ private static final Logger logger = LoggerFactory.getLogger(EventRestApiServlet.class);
private final EventDispatcher dispatcher;
@@ -66,8 +61,8 @@
try {
Context.setForwardedEvent(true);
if (!MediaType.parse(req.getContentType()).is(JSON_UTF_8)) {
- sendError(rsp, SC_UNSUPPORTED_MEDIA_TYPE,
- "Expecting " + JSON_UTF_8.toString() + " content type");
+ sendError(
+ rsp, SC_UNSUPPORTED_MEDIA_TYPE, "Expecting " + JSON_UTF_8.toString() + " content type");
return;
}
Event event = getEventFromRequest(req);
@@ -86,15 +81,15 @@
private Event getEventFromRequest(HttpServletRequest req) throws IOException {
String jsonEvent = CharStreams.toString(req.getReader());
- Gson gson = new GsonBuilder()
- .registerTypeAdapter(Event.class, new EventDeserializer())
- .registerTypeAdapter(Supplier.class, new SupplierDeserializer())
- .create();
+ Gson gson =
+ new GsonBuilder()
+ .registerTypeAdapter(Event.class, new EventDeserializer())
+ .registerTypeAdapter(Supplier.class, new SupplierDeserializer())
+ .create();
return gson.fromJson(jsonEvent, Event.class);
}
- private static void sendError(HttpServletResponse rsp, int statusCode,
- String message) {
+ private static void sendError(HttpServletResponse rsp, int statusCode, String message) {
try {
rsp.sendError(statusCode, message);
} catch (IOException e) {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ForwardingException.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ForwardingException.java
index d7d09ee..35cc05e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ForwardingException.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ForwardingException.java
@@ -32,4 +32,4 @@
boolean isRecoverable() {
return isRecoverable;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java
index 650bc28..23f42ab 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java
@@ -14,18 +14,16 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
import com.google.common.base.Strings;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
-
final class GsonParser {
- private GsonParser() {
- }
+ private GsonParser() {}
static Object fromJson(String cacheName, String json) {
Gson gson = new GsonBuilder().create();
@@ -36,13 +34,11 @@
key = gson.fromJson(Strings.nullToEmpty(json).trim(), Account.Id.class);
break;
case Constants.GROUPS:
- key = gson.fromJson(Strings.nullToEmpty(json).trim(),
- AccountGroup.Id.class);
+ key = gson.fromJson(Strings.nullToEmpty(json).trim(), AccountGroup.Id.class);
break;
case Constants.GROUPS_BYINCLUDE:
case Constants.GROUPS_MEMBERS:
- key = gson.fromJson(Strings.nullToEmpty(json).trim(),
- AccountGroup.UUID.class);
+ key = gson.fromJson(Strings.nullToEmpty(json).trim(), AccountGroup.UUID.class);
break;
case Constants.PROJECT_LIST:
key = gson.fromJson(Strings.nullToEmpty(json), Object.class);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProvider.java
index bdd641e..e68875f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProvider.java
@@ -14,11 +14,15 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
import com.google.inject.Inject;
import com.google.inject.Provider;
-
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-
+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.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.config.RequestConfig;
@@ -36,20 +40,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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;
-
-/**
- * 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;
@@ -67,7 +60,8 @@
@Override
public CloseableHttpClient get() {
- return HttpClients.custom().setSSLSocketFactory(sslSocketFactory)
+ return HttpClients.custom()
+ .setSSLSocketFactory(sslSocketFactory)
.setConnectionManager(customConnectionManager())
.setDefaultCredentialsProvider(buildCredentials())
.setDefaultRequestConfig(customRequestConfig())
@@ -75,16 +69,19 @@
}
private RequestConfig customRequestConfig() {
- return RequestConfig.custom().setConnectTimeout(cfg.getConnectionTimeout())
+ return RequestConfig.custom()
+ .setConnectTimeout(cfg.getConnectionTimeout())
.setSocketTimeout(cfg.getSocketTimeout())
.setConnectionRequestTimeout(cfg.getConnectionTimeout())
.build();
}
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);
@@ -94,14 +91,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;
@@ -113,8 +108,8 @@
private BasicCredentialsProvider buildCredentials() {
BasicCredentialsProvider creds = new BasicCredentialsProvider();
- creds.setCredentials(AuthScope.ANY,
- new UsernamePasswordCredentials(cfg.getUser(), cfg.getPassword()));
+ creds.setCredentials(
+ AuthScope.ANY, new UsernamePasswordCredentials(cfg.getUser(), cfg.getPassword()));
return creds;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandler.java
index ad98f2e..446317e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandler.java
@@ -17,7 +17,7 @@
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
-
+import java.io.IOException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.ResponseHandler;
@@ -25,8 +25,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
class HttpResponseHandler implements ResponseHandler<HttpResult> {
static class HttpResult {
@@ -47,8 +45,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/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSession.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSession.java
index 6e2c7a8..0a0e898 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSession.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSession.java
@@ -14,30 +14,26 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
+import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfo;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.net.MediaType;
import com.google.inject.Inject;
import com.google.inject.Provider;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
-import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfo;
-
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
class HttpSession {
private final CloseableHttpClient httpClient;
private final Provider<Optional<PeerInfo>> peerInfo;
@Inject
- HttpSession(CloseableHttpClient httpClient,
- Provider<Optional<PeerInfo>> peerInfo) {
+ HttpSession(CloseableHttpClient httpClient, Provider<Optional<PeerInfo>> peerInfo) {
this.httpClient = httpClient;
this.peerInfo = peerInfo;
}
@@ -57,8 +53,7 @@
HttpResult delete(String endpoint) throws IOException {
return httpClient.execute(
- new HttpDelete(getPeerInfo().getDirectUrl() + endpoint),
- new HttpResponseHandler());
+ new HttpDelete(getPeerInfo().getDirectUrl() + endpoint), new HttpResponseHandler());
}
private PeerInfo getPeerInfo() throws PeerInfoNotAvailableException {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
index a96b1c4..e4ac518 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServlet.java
@@ -17,33 +17,27 @@
import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.index.account.AccountIndexer;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class IndexAccountRestApiServlet extends HttpServlet {
private static final long serialVersionUID = -1L;
- private static final Logger logger =
- LoggerFactory.getLogger(IndexAccountRestApiServlet.class);
- private static final Map<Account.Id, AtomicInteger> accountIdLocks =
- new HashMap<>();
+ private static final Logger logger = LoggerFactory.getLogger(IndexAccountRestApiServlet.class);
+ private static final Map<Account.Id, AtomicInteger> accountIdLocks = new HashMap<>();
private final AccountIndexer indexer;
@@ -72,8 +66,7 @@
}
}
- private static void sendError(HttpServletResponse rsp, int statusCode,
- String message) {
+ private static void sendError(HttpServletResponse rsp, int statusCode, String message) {
try {
rsp.sendError(statusCode, message);
} catch (IOException e) {
@@ -84,7 +77,8 @@
private void index(Account.Id id) throws IOException {
AtomicInteger accountIdLock = getAndIncrementAccountIdLock(id);
synchronized (accountIdLock) {
- indexer.index(id);;
+ indexer.index(id);
+ ;
logger.debug("Account {} successfully indexed", id);
}
if (accountIdLock.decrementAndGet() == 0) {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
index ad4aa5e..75ca59b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServlet.java
@@ -18,6 +18,7 @@
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.index.change.ChangeIndexer;
@@ -25,36 +26,28 @@
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class IndexChangeRestApiServlet extends HttpServlet {
private static final long serialVersionUID = -1L;
- private static final Logger logger =
- LoggerFactory.getLogger(IndexChangeRestApiServlet.class);
- private static final Map<Change.Id, AtomicInteger> changeIdLocks =
- new HashMap<>();
+ private static final Logger logger = LoggerFactory.getLogger(IndexChangeRestApiServlet.class);
+ private static final Map<Change.Id, AtomicInteger> changeIdLocks = new HashMap<>();
private final ChangeIndexer indexer;
private final SchemaFactory<ReviewDb> schemaFactory;
@Inject
- IndexChangeRestApiServlet(ChangeIndexer indexer,
- SchemaFactory<ReviewDb> schemaFactory) {
+ IndexChangeRestApiServlet(ChangeIndexer indexer, SchemaFactory<ReviewDb> schemaFactory) {
this.indexer = indexer;
this.schemaFactory = schemaFactory;
}
@@ -71,8 +64,7 @@
process(req, rsp, "delete");
}
- private void process(HttpServletRequest req, HttpServletResponse rsp,
- String operation) {
+ private void process(HttpServletRequest req, HttpServletResponse rsp, String operation) {
rsp.setContentType("text/plain");
rsp.setCharacterEncoding("UTF-8");
String path = req.getPathInfo();
@@ -83,19 +75,18 @@
index(id, operation);
rsp.setStatus(SC_NO_CONTENT);
} catch (IOException e) {
- sendError(rsp,SC_CONFLICT, e.getMessage());
+ sendError(rsp, SC_CONFLICT, e.getMessage());
logger.error("Unable to update change index", e);
} catch (OrmException e) {
String msg = "Error trying to find a change \n";
- sendError(rsp,SC_NOT_FOUND, msg);
+ sendError(rsp, SC_NOT_FOUND, msg);
logger.debug(msg, e);
} finally {
Context.unsetForwardedEvent();
}
}
- private static void sendError(HttpServletResponse rsp, int statusCode,
- String message) {
+ private static void sendError(HttpServletResponse rsp, int statusCode, String message) {
try {
rsp.sendError(statusCode, message);
} catch (IOException e) {
@@ -103,8 +94,7 @@
}
}
- private void index(Change.Id id, String operation)
- throws IOException, OrmException {
+ private void index(Change.Id id, String operation) throws IOException, OrmException {
AtomicInteger changeIdLock = getAndIncrementChangeIdLock(id);
synchronized (changeIdLock) {
if ("index".equals(operation)) {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
index 467ae53..49326cc 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
@@ -14,6 +14,9 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
import com.google.common.base.Joiner;
import com.google.common.base.Supplier;
import com.google.gerrit.extensions.annotations.PluginName;
@@ -21,30 +24,20 @@
import com.google.gerrit.server.events.SupplierSerializer;
import com.google.gson.GsonBuilder;
import com.google.inject.Inject;
-
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
-
+import java.io.IOException;
+import javax.net.ssl.SSLException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
-import javax.net.ssl.SSLException;
-
class RestForwarder implements Forwarder {
- private static final Logger log =
- LoggerFactory.getLogger(RestForwarder.class);
+ private static final Logger log = LoggerFactory.getLogger(RestForwarder.class);
private final HttpSession httpSession;
private final String pluginRelativePath;
private final Configuration cfg;
@Inject
- RestForwarder(HttpSession httpClient,
- @PluginName String pluginName,
- Configuration cfg) {
+ RestForwarder(HttpSession httpClient, @PluginName String pluginName, Configuration cfg) {
this.httpSession = httpClient;
this.pluginRelativePath = Joiner.on("/").join("/plugins", pluginName);
this.cfg = cfg;
@@ -55,8 +48,8 @@
return new Request("index account " + accountId) {
@Override
HttpResult send() throws IOException {
- return httpSession.post(Joiner.on("/").join(pluginRelativePath,
- "index/account", accountId));
+ return httpSession.post(
+ Joiner.on("/").join(pluginRelativePath, "index/account", accountId));
}
}.execute();
}
@@ -90,11 +83,12 @@
return new Request("send event " + event.type) {
@Override
HttpResult send() throws IOException {
- String serializedEvent = new GsonBuilder()
- .registerTypeAdapter(Supplier.class, new SupplierSerializer()).create()
- .toJson(event);
- return httpSession.post(
- Joiner.on("/").join(pluginRelativePath, "event"), serializedEvent);
+ String serializedEvent =
+ new GsonBuilder()
+ .registerTypeAdapter(Supplier.class, new SupplierSerializer())
+ .create()
+ .toJson(event);
+ return httpSession.post(Joiner.on("/").join(pluginRelativePath, "event"), serializedEvent);
}
}.execute();
}
@@ -105,9 +99,7 @@
@Override
HttpResult send() throws IOException {
String json = GsonParser.toJson(cacheName, key);
- return httpSession
- .post(Joiner.on("/").join(pluginRelativePath, "cache", cacheName),
- json);
+ return httpSession.post(Joiner.on("/").join(pluginRelativePath, "cache", cacheName), json);
}
}.execute();
}
@@ -121,7 +113,7 @@
}
boolean execute() {
- for (;;) {
+ for (; ; ) {
try {
execCnt++;
tryOnce();
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
index 8bb3ce1..a7a451b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderModule.java
@@ -14,19 +14,16 @@
package com.ericsson.gerrit.plugins.highavailability.forwarder.rest;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-
import org.apache.http.impl.client.CloseableHttpClient;
public class RestForwarderModule extends AbstractModule {
@Override
protected void configure() {
- bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class)
- .in(Scopes.SINGLETON);
+ bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class).in(Scopes.SINGLETON);
bind(HttpSession.class);
bind(Forwarder.class).to(RestForwarder.class);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
index 99fffa6..b08052a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
@@ -14,15 +14,13 @@
package com.ericsson.gerrit.plugins.highavailability.index;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.google.common.base.Objects;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.events.AccountIndexedListener;
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.inject.Inject;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -32,13 +30,12 @@
private final Executor executor;
private final Forwarder forwarder;
private final String pluginName;
- private final Set<IndexTask> queuedTasks = Collections
- .newSetFromMap(new ConcurrentHashMap<IndexTask, Boolean>());
+ private final Set<IndexTask> queuedTasks =
+ Collections.newSetFromMap(new ConcurrentHashMap<IndexTask, Boolean>());
@Inject
- IndexEventHandler(@IndexExecutor Executor executor,
- @PluginName String pluginName,
- Forwarder forwarder) {
+ IndexEventHandler(
+ @IndexExecutor Executor executor, @PluginName String pluginName, Forwarder forwarder) {
this.forwarder = forwarder;
this.executor = executor;
this.pluginName = pluginName;
@@ -122,8 +119,7 @@
@Override
public String toString() {
- return String.format("[%s] Index change %s in target instance",
- pluginName, id);
+ return String.format("[%s] Index change %s in target instance", pluginName, id);
}
}
@@ -154,8 +150,7 @@
@Override
public String toString() {
- return String.format("[%s] Index account %s in target instance",
- pluginName, id);
+ return String.format("[%s] Index account %s in target instance", pluginName, id);
}
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutor.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutor.java
index e6c20bd..59854fd 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutor.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutor.java
@@ -17,10 +17,8 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
@Retention(RUNTIME)
@BindingAnnotation
-@interface IndexExecutor {
-}
+@interface IndexExecutor {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
index f0a2b62..efe323e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProvider.java
@@ -14,19 +14,17 @@
package com.ericsson.gerrit.plugins.highavailability.index;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.ExecutorProvider;
-
@Singleton
class IndexExecutorProvider extends ExecutorProvider {
@Inject
- IndexExecutorProvider(WorkQueue workQueue,
- Configuration config) {
+ IndexExecutorProvider(WorkQueue workQueue, Configuration config) {
super(workQueue, config.getIndexThreadPoolSize(), "Forward-index-event");
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
index cd9839c..e412bba 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexModule.java
@@ -18,20 +18,15 @@
import com.google.gerrit.extensions.events.ChangeIndexedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleModule;
-
import java.util.concurrent.Executor;
public class IndexModule extends LifecycleModule {
@Override
protected void configure() {
- bind(Executor.class)
- .annotatedWith(IndexExecutor.class)
- .toProvider(IndexExecutorProvider.class);
+ bind(Executor.class).annotatedWith(IndexExecutor.class).toProvider(IndexExecutorProvider.class);
listener().to(IndexExecutorProvider.class);
- DynamicSet.bind(binder(), ChangeIndexedListener.class).to(
- IndexEventHandler.class);
- DynamicSet.bind(binder(), AccountIndexedListener.class).to(
- IndexEventHandler.class);
+ DynamicSet.bind(binder(), ChangeIndexedListener.class).to(IndexEventHandler.class);
+ DynamicSet.bind(binder(), AccountIndexedListener.class).to(IndexEventHandler.class);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
index c4f38ce..6a58661 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
@@ -21,7 +21,6 @@
public class PeerInfoModule extends AbstractModule {
@Override
protected void configure() {
- bind(new TypeLiteral<Optional<PeerInfo>>() {})
- .toProvider(PluginConfigPeerInfoProvider.class);
+ bind(new TypeLiteral<Optional<PeerInfo>>() {}).toProvider(PluginConfigPeerInfoProvider.class);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PluginConfigPeerInfoProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PluginConfigPeerInfoProvider.java
index 076115b..74e148b 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PluginConfigPeerInfoProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PluginConfigPeerInfoProvider.java
@@ -14,12 +14,11 @@
package com.ericsson.gerrit.plugins.highavailability.peers;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
import com.google.common.base.Optional;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-
public class PluginConfigPeerInfoProvider implements Provider<Optional<PeerInfo>> {
private final Optional<PeerInfo> peerInfo;
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/CleanupIntervalMillis.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/CleanupIntervalMillis.java
index 57ce2b6..6ef6260 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/CleanupIntervalMillis.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/CleanupIntervalMillis.java
@@ -17,10 +17,8 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
@Retention(RUNTIME)
@BindingAnnotation
-public @interface CleanupIntervalMillis {
-}
+public @interface CleanupIntervalMillis {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSession.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSession.java
index 7322ef7..4770052 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSession.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSession.java
@@ -23,7 +23,6 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.servlet.RequestScoped;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -31,14 +30,20 @@
public class FileBasedWebSession extends CacheBasedWebSession {
@Inject
- FileBasedWebSession(@RootRelative Provider<HttpServletRequest> request,
+ FileBasedWebSession(
+ @RootRelative Provider<HttpServletRequest> request,
@RootRelative Provider<HttpServletResponse> response,
WebSessionManagerFactory managerFactory,
FileBasedWebsessionCache cache,
AuthConfig authConfig,
Provider<AnonymousUser> anonymousProvider,
RequestFactory identified) {
- super(request.get(), response.get(), managerFactory.create(cache),
- authConfig, anonymousProvider, identified);
+ super(
+ request.get(),
+ response.get(),
+ managerFactory.create(cache),
+ authConfig,
+ anonymousProvider,
+ identified);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
index ea3ebb2..c5e2f97 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleaner.java
@@ -23,12 +23,10 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-
+import java.util.concurrent.ScheduledFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.concurrent.ScheduledFuture;
-
@Singleton
class FileBasedWebSessionCacheCleaner implements LifecycleListener {
@@ -38,7 +36,8 @@
private ScheduledFuture<?> scheduledCleanupTask;
@Inject
- FileBasedWebSessionCacheCleaner(WorkQueue queue,
+ FileBasedWebSessionCacheCleaner(
+ WorkQueue queue,
Provider<CleanupTask> cleanupTaskProvider,
@CleanupIntervalMillis long cleanupIntervalMillis) {
this.queue = queue;
@@ -49,8 +48,13 @@
@Override
public void start() {
scheduledCleanupTask =
- queue.getDefaultQueue().scheduleAtFixedRate(cleanupTaskProvider.get(),
- SECONDS.toMillis(1), cleanupIntervalMillis, MILLISECONDS);
+ queue
+ .getDefaultQueue()
+ .scheduleAtFixedRate(
+ cleanupTaskProvider.get(),
+ SECONDS.toMillis(1),
+ cleanupIntervalMillis,
+ MILLISECONDS);
}
@Override
@@ -63,14 +67,12 @@
}
class CleanupTask implements Runnable {
- private static final Logger logger =
- LoggerFactory.getLogger(CleanupTask.class);
+ private static final Logger logger = LoggerFactory.getLogger(CleanupTask.class);
private final FileBasedWebsessionCache fileBasedWebSessionCache;
private final String pluginName;
@Inject
- CleanupTask(FileBasedWebsessionCache fileBasedWebSessionCache,
- @PluginName String pluginName) {
+ CleanupTask(FileBasedWebsessionCache fileBasedWebSessionCache, @PluginName String pluginName) {
this.fileBasedWebSessionCache = fileBasedWebSessionCache;
this.pluginName = pluginName;
}
@@ -84,7 +86,6 @@
@Override
public String toString() {
- return String.format("[%s] Clean up expired file based websessions",
- pluginName);
+ return String.format("[%s] Clean up expired file based websessions", pluginName);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
index b162141..ca5e841 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
@@ -14,6 +14,7 @@
package com.ericsson.gerrit.plugins.highavailability.websession.file;
+import com.ericsson.gerrit.plugins.highavailability.SharedDirectory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheStats;
import com.google.common.collect.ImmutableMap;
@@ -22,13 +23,6 @@
import com.google.gerrit.httpd.WebSessionManager.Val;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.highavailability.SharedDirectory;
-
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
@@ -47,18 +41,18 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
-public class FileBasedWebsessionCache
- implements Cache<String, WebSessionManager.Val> {
- private static final Logger log =
- LoggerFactory.getLogger(FileBasedWebsessionCache.class);
+public class FileBasedWebsessionCache implements Cache<String, WebSessionManager.Val> {
+ private static final Logger log = LoggerFactory.getLogger(FileBasedWebsessionCache.class);
private final Path websessionsDir;
@Inject
- public FileBasedWebsessionCache(@SharedDirectory Path sharedDirectory)
- throws IOException {
+ public FileBasedWebsessionCache(@SharedDirectory Path sharedDirectory) throws IOException {
this.websessionsDir = sharedDirectory.resolve("websessions");
Files.createDirectories(websessionsDir);
}
@@ -89,8 +83,7 @@
}
@Override
- public Val get(String key, Callable<? extends Val> valueLoader)
- throws ExecutionException {
+ public Val get(String key, Callable<? extends Val> valueLoader) throws ExecutionException {
Val value = getIfPresent(key);
if (value == null) {
try {
@@ -148,12 +141,13 @@
@Override
public void put(String key, Val value) {
try {
- Path tempFile = Files.createTempFile(websessionsDir,
- UUID.randomUUID().toString(), null);
+ Path tempFile = Files.createTempFile(websessionsDir, UUID.randomUUID().toString(), null);
try (OutputStream fileStream = Files.newOutputStream(tempFile);
ObjectOutputStream objStream = new ObjectOutputStream(fileStream)) {
objStream.writeObject(value);
- Files.move(tempFile, tempFile.resolveSibling(key),
+ Files.move(
+ tempFile,
+ tempFile.resolveSibling(key),
StandardCopyOption.REPLACE_EXISTING,
StandardCopyOption.ATOMIC_MOVE);
}
@@ -186,8 +180,11 @@
ObjectInputStream objStream = new ObjectInputStream(fileStream)) {
return (Val) objStream.readObject();
} catch (ClassNotFoundException e) {
- log.warn("Entry {} in cache {} has an incompatible class and can't be"
- + " deserialized. Invalidating entry.", path, websessionsDir);
+ log.warn(
+ "Entry {} in cache {} has an incompatible class and can't be"
+ + " deserialized. Invalidating entry.",
+ path,
+ websessionsDir);
log.debug(e.getMessage(), e);
invalidate(path.getFileName().toString());
} catch (IOException e) {
@@ -207,8 +204,7 @@
private List<Path> listFiles() {
List<Path> files = new ArrayList<>();
- try (DirectoryStream<Path> dirStream =
- Files.newDirectoryStream(websessionsDir)) {
+ try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(websessionsDir)) {
for (Path path : dirStream) {
files.add(path);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModule.java
index 4ececb9..addaa60 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModule.java
@@ -33,7 +33,8 @@
@Override
protected void configure() {
bindScope(RequestScoped.class, ServletScopes.REQUEST);
- DynamicItem.bind(binder(), WebSession.class).to(FileBasedWebSession.class)
+ DynamicItem.bind(binder(), WebSession.class)
+ .to(FileBasedWebSession.class)
.in(RequestScoped.class);
listener().to(FileBasedWebSessionCacheCleaner.class);
}
@@ -41,10 +42,9 @@
@Provides
@Singleton
@CleanupIntervalMillis
- Long getCleanupInterval(PluginConfigFactory cfg,
- @PluginName String pluginName) {
- String fromConfig = Strings.nullToEmpty(
- cfg.getFromGerritConfig(pluginName, true).getString("cleanupInterval"));
+ Long getCleanupInterval(PluginConfigFactory cfg, @PluginName String pluginName) {
+ String fromConfig =
+ Strings.nullToEmpty(cfg.getFromGerritConfig(pluginName, true).getString("cleanupInterval"));
return ConfigUtil.getTimeUnit(fromConfig, HOURS.toMillis(24), MILLISECONDS);
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
index 0cd3e4a..97a32a1 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
@@ -21,7 +21,6 @@
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,17 +40,14 @@
private static final int RETRY_INTERVAL = 1000;
private static final int THREAD_POOL_SIZE = 1;
- @Mock
- private PluginConfigFactory cfgFactoryMock;
- @Mock
- private PluginConfig configMock;
+ @Mock private PluginConfigFactory cfgFactoryMock;
+ @Mock private PluginConfig configMock;
private Configuration configuration;
private String pluginName = "high-availability";
@Before
public void setUp() throws Exception {
- when(cfgFactoryMock.getFromGerritConfig(pluginName, true))
- .thenReturn(configMock);
+ when(cfgFactoryMock.getFromGerritConfig(pluginName, true)).thenReturn(configMock);
}
@Test
@@ -64,10 +60,8 @@
assertThat(configuration.getSocketTimeout()).isEqualTo(TIMEOUT);
assertThat(configuration.getMaxTries()).isEqualTo(MAX_TRIES);
assertThat(configuration.getRetryInterval()).isEqualTo(RETRY_INTERVAL);
- assertThat(configuration.getIndexThreadPoolSize())
- .isEqualTo(THREAD_POOL_SIZE);
- assertThat(configuration.getCacheThreadPoolSize())
- .isEqualTo(THREAD_POOL_SIZE);
+ assertThat(configuration.getIndexThreadPoolSize()).isEqualTo(THREAD_POOL_SIZE);
+ assertThat(configuration.getCacheThreadPoolSize()).isEqualTo(THREAD_POOL_SIZE);
}
@Test
@@ -111,12 +105,9 @@
when(configMock.getString("url")).thenReturn(values ? URL : null);
when(configMock.getString("user")).thenReturn(values ? USER : null);
when(configMock.getString("password")).thenReturn(values ? PASS : null);
- when(configMock.getInt("connectionTimeout", TIMEOUT))
- .thenReturn(values ? TIMEOUT : 0);
- when(configMock.getInt("socketTimeout", TIMEOUT))
- .thenReturn(values ? TIMEOUT : 0);
- when(configMock.getInt("maxTries", MAX_TRIES))
- .thenReturn(values ? MAX_TRIES : 0);
+ when(configMock.getInt("connectionTimeout", TIMEOUT)).thenReturn(values ? TIMEOUT : 0);
+ when(configMock.getInt("socketTimeout", TIMEOUT)).thenReturn(values ? TIMEOUT : 0);
+ when(configMock.getInt("maxTries", MAX_TRIES)).thenReturn(values ? MAX_TRIES : 0);
when(configMock.getInt("retryInterval", RETRY_INTERVAL))
.thenReturn(values ? RETRY_INTERVAL : 0);
when(configMock.getInt("indexThreadPoolSize", THREAD_POOL_SIZE))
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ModuleTest.java
index 2e6a768..b92da94 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ModuleTest.java
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-
package com.ericsson.gerrit.plugins.highavailability;
import static com.google.common.truth.Truth.assertThat;
@@ -21,7 +20,9 @@
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.inject.ProvisionException;
-
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -30,23 +31,16 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-
@RunWith(MockitoJUnitRunner.class)
public class ModuleTest {
private static String PLUGIN_NAME = "somePluginName";
- @Mock
- private PluginConfigFactory pluginConfigFactoryMock;
+ @Mock private PluginConfigFactory pluginConfigFactoryMock;
- @Mock
- private PluginConfig pluginConfigMock;
+ @Mock private PluginConfig pluginConfigMock;
- @Rule
- public TemporaryFolder tempFolder = new TemporaryFolder();
+ @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
private Module module;
@@ -58,8 +52,7 @@
}
@Test(expected = ProvisionException.class)
- public void shouldThrowExceptionIfSharedDirectoryNotConfigured()
- throws IOException {
+ public void shouldThrowExceptionIfSharedDirectoryNotConfigured() throws IOException {
module.getSharedDirectory(pluginConfigFactoryMock, PLUGIN_NAME);
}
@@ -69,10 +62,8 @@
when(pluginConfigMock.getString("sharedDirectory"))
.thenReturn(configuredDirectory.getAbsolutePath());
- Path sharedDirectory =
- module.getSharedDirectory(pluginConfigFactoryMock, PLUGIN_NAME);
- assertThat(sharedDirectory.toString())
- .isEqualTo(configuredDirectory.toString());
+ Path sharedDirectory = module.getSharedDirectory(pluginConfigFactoryMock, PLUGIN_NAME);
+ assertThat(sharedDirectory.toString()).isEqualTo(configuredDirectory.toString());
}
@Test
@@ -82,14 +73,12 @@
when(pluginConfigMock.getString("sharedDirectory"))
.thenReturn(configuredDirectory.getAbsolutePath());
- Path sharedDirectory =
- module.getSharedDirectory(pluginConfigFactoryMock, PLUGIN_NAME);
+ Path sharedDirectory = module.getSharedDirectory(pluginConfigFactoryMock, PLUGIN_NAME);
assertThat(sharedDirectory.toFile().exists()).isTrue();
}
@Test(expected = IOException.class)
- public void shouldThrowAnExceptionIfAnErrorOccurCreatingSharedDirectory()
- throws IOException {
+ public void shouldThrowAnExceptionIfAnErrorOccurCreatingSharedDirectory() throws IOException {
File configuredDirectory = tempFolder.newFile();
when(pluginConfigMock.getString("sharedDirectory"))
.thenReturn(configuredDirectory.getAbsolutePath());
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
index cdd70ea..c8a435e 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
@@ -22,65 +22,61 @@
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.RequestListener;
+import com.github.tomakehurst.wiremock.http.Response;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
import com.google.common.base.Throwables;
import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.TestPlugin;
import com.google.gerrit.acceptance.UseSsh;
-
-import com.github.tomakehurst.wiremock.http.Request;
-import com.github.tomakehurst.wiremock.http.RequestListener;
-import com.github.tomakehurst.wiremock.http.Response;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
import org.apache.http.HttpStatus;
import org.junit.Rule;
import org.junit.Test;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeUnit;
-
@NoHttpd
@UseSsh
@TestPlugin(
- name = "high-availability",
- sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",
- httpModule = "com.ericsson.gerrit.plugins.highavailability.HttpModule"
+ name = "high-availability",
+ sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",
+ httpModule = "com.ericsson.gerrit.plugins.highavailability.HttpModule"
)
public class CacheEvictionIT extends LightweightPluginDaemonTest {
private static final int PORT = 18888;
private static final String URL = "http://localhost:" + PORT;
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(options().port(PORT), false);
+ @Rule public WireMockRule wireMockRule = new WireMockRule(options().port(PORT), false);
@Test
@GerritConfig(name = "plugin.high-availability.url", value = URL)
@GerritConfig(name = "plugin.high-availability`.user", value = "admin")
@GerritConfig(name = "plugin.high-availability.cacheThreadPoolSize", value = "10")
public void flushAndSendPost() throws Exception {
- final String flushRequest =
- "/plugins/high-availability/cache/" + Constants.PROJECT_LIST;
+ final String flushRequest = "/plugins/high-availability/cache/" + Constants.PROJECT_LIST;
final CyclicBarrier checkPoint = new CyclicBarrier(2);
- wireMockRule.addMockServiceRequestListener(new RequestListener() {
- @Override
- public void requestReceived(Request request, Response response) {
- if (request.getAbsoluteUrl().contains(flushRequest)) {
- try {
- checkPoint.await();
- } catch (InterruptedException | BrokenBarrierException e) {
- Throwables.propagateIfPossible(e);
+ wireMockRule.addMockServiceRequestListener(
+ new RequestListener() {
+ @Override
+ public void requestReceived(Request request, Response response) {
+ if (request.getAbsoluteUrl().contains(flushRequest)) {
+ try {
+ checkPoint.await();
+ } catch (InterruptedException | BrokenBarrierException e) {
+ Throwables.propagateIfPossible(e);
+ }
+ }
}
- }
- }
- });
- givenThat(post(urlEqualTo(flushRequest))
- .willReturn(aResponse().withStatus(HttpStatus.SC_NO_CONTENT)));
+ });
+ givenThat(
+ post(urlEqualTo(flushRequest))
+ .willReturn(aResponse().withStatus(HttpStatus.SC_NO_CONTENT)));
- adminSshSession
- .exec("gerrit flush-caches --cache " + Constants.PROJECT_LIST);
+ adminSshSession.exec("gerrit flush-caches --cache " + Constants.PROJECT_LIST);
checkPoint.await(5, TimeUnit.SECONDS);
verify(postRequestedFor(urlEqualTo(flushRequest)));
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProviderTest.java
index 21e6cab..08a1b19 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheExecutorProviderTest.java
@@ -19,10 +19,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.gerrit.server.git.WorkQueue;
-
import com.ericsson.gerrit.plugins.highavailability.Configuration;
-
+import com.google.gerrit.server.git.WorkQueue;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,20 +30,17 @@
@RunWith(MockitoJUnitRunner.class)
public class CacheExecutorProviderTest {
- @Mock
- private WorkQueue.Executor executorMock;
+ @Mock private WorkQueue.Executor executorMock;
private CacheExecutorProvider cacheExecutorProvider;
@Before
public void setUp() throws Exception {
WorkQueue workQueueMock = mock(WorkQueue.class);
- when(workQueueMock.createQueue(4, "Forward-cache-eviction-event"))
- .thenReturn(executorMock);
+ when(workQueueMock.createQueue(4, "Forward-cache-eviction-event")).thenReturn(executorMock);
Configuration configMock = mock(Configuration.class);
when(configMock.getCacheThreadPoolSize()).thenReturn(4);
- cacheExecutorProvider =
- new CacheExecutorProvider(workQueueMock, configMock);
+ cacheExecutorProvider = new CacheExecutorProvider(workQueueMock, configMock);
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProviderTest.java
index 054a2e6..f72ddc9 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventExecutorProviderTest.java
@@ -20,7 +20,6 @@
import static org.mockito.Mockito.when;
import com.google.gerrit.server.git.WorkQueue;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,15 +28,13 @@
@RunWith(MockitoJUnitRunner.class)
public class EventExecutorProviderTest {
- @Mock
- private WorkQueue.Executor executorMock;
+ @Mock private WorkQueue.Executor executorMock;
private EventExecutorProvider eventsExecutorProvider;
@Before
public void setUp() throws Exception {
WorkQueue workQueueMock = mock(WorkQueue.class);
- when(workQueueMock.createQueue(1, "Forward-stream-event"))
- .thenReturn(executorMock);
+ when(workQueueMock.createQueue(1, "Forward-stream-event")).thenReturn(executorMock);
eventsExecutorProvider = new EventExecutorProvider(workQueueMock);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
index 5cc957d..0ce10b0 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/EventHandlerTest.java
@@ -19,15 +19,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
+import com.ericsson.gerrit.plugins.highavailability.event.EventHandler.EventTask;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.gerrit.server.events.RefUpdatedEvent;
-
-import com.ericsson.gerrit.plugins.highavailability.event.EventHandler.EventTask;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,13 +38,11 @@
private EventHandler eventHandler;
- @Mock
- private Forwarder forwarder;
+ @Mock private Forwarder forwarder;
@Before
public void setUp() {
- eventHandler = new EventHandler(forwarder, MoreExecutors.directExecutor(),
- PLUGIN_NAME);
+ eventHandler = new EventHandler(forwarder, MoreExecutors.directExecutor(), PLUGIN_NAME);
}
@Test
@@ -62,7 +58,6 @@
verifyZeroInteractions(forwarder);
}
-
@Test
public void shouldNotForwardIfAlreadyForwardedEvent() throws Exception {
Context.setForwardedEvent(true);
@@ -75,7 +70,8 @@
public void tesEventTaskToString() throws Exception {
Event event = new RefUpdatedEvent();
EventTask task = eventHandler.new EventTask(event);
- assertThat(task.toString()).isEqualTo(String.format(
- "[%s] Send event '%s' to target instance", PLUGIN_NAME, event.type));
+ assertThat(task.toString())
+ .isEqualTo(
+ String.format("[%s] Send event '%s' to target instance", PLUGIN_NAME, event.type));
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
index 713f7ef..c4d4802 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/event/ForwardedAwareEventBrokerTest.java
@@ -18,13 +18,10 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
import com.google.gerrit.common.EventListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.events.Event;
-
-import com.ericsson.gerrit.plugins.highavailability.event.ForwardedAwareEventBroker;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
index 4813a7d..c0d13c8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
@@ -21,33 +21,25 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
import com.google.common.cache.Cache;
import com.google.gerrit.extensions.registration.DynamicMap;
-
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
-
+import java.io.BufferedReader;
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.BufferedReader;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(MockitoJUnitRunner.class)
public class CacheRestApiServletTest {
- @Mock
- private HttpServletRequest request;
- @Mock
- private HttpServletResponse response;
- @Mock
- private BufferedReader reader;
- @Mock
- private DynamicMap<Cache<?, ?>> cacheMap;
+ @Mock private HttpServletRequest request;
+ @Mock private HttpServletResponse response;
+ @Mock private BufferedReader reader;
+ @Mock private DynamicMap<Cache<?, ?>> cacheMap;
private CacheRestApiServlet servlet;
@Before
@@ -83,7 +75,6 @@
public void evictGroupsMembers() throws Exception {
configureMocksFor(Constants.GROUPS_MEMBERS);
servlet.doPost(request, response);
-
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
index 27d46b7..1c4a9e6 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/EventRestApiServletTest.java
@@ -32,9 +32,11 @@
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.StandardKeyEncoder;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.EventRestApiServlet;
-
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,29 +44,18 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(MockitoJUnitRunner.class)
public class EventRestApiServletTest {
private static final String ERR_MSG = "some Error";
- @Mock
- private EventDispatcher dispatcher;
- @Mock
- private HttpServletRequest req;
- @Mock
- private HttpServletResponse rsp;
+ @Mock private EventDispatcher dispatcher;
+ @Mock private HttpServletRequest req;
+ @Mock private HttpServletResponse rsp;
private EventRestApiServlet eventRestApiServlet;
@BeforeClass
public static void setup() {
- EventTypes.register(RefReplicationDoneEvent.TYPE,
- RefReplicationDoneEvent.class);
+ EventTypes.register(RefReplicationDoneEvent.TYPE, RefReplicationDoneEvent.class);
KeyUtil.setEncoderImpl(new StandardKeyEncoder());
}
@@ -76,11 +67,11 @@
@Test
public void testDoPostRefReplicationDoneEvent() throws Exception {
- String event = "{\"project\":\"gerrit/some-project\",\"ref\":"
- + "\"refs/changes/76/669676/2\",\"nodesCount\":1,\"type\":"
- + "\"ref-replication-done\",\"eventCreatedOn\":1451415011}";
- when(req.getReader())
- .thenReturn(new BufferedReader(new StringReader(event)));
+ String event =
+ "{\"project\":\"gerrit/some-project\",\"ref\":"
+ + "\"refs/changes/76/669676/2\",\"nodesCount\":1,\"type\":"
+ + "\"ref-replication-done\",\"eventCreatedOn\":1451415011}";
+ when(req.getReader()).thenReturn(new BufferedReader(new StringReader(event)));
dispatcher.postEvent(any(RefReplicationDoneEvent.class));
eventRestApiServlet.doPost(req, rsp);
verify(rsp).setStatus(SC_NO_CONTENT);
@@ -88,12 +79,13 @@
@Test
public void testDoPostDispatcherFailure() throws Exception {
- String event = "{\"project\":\"gerrit/some-project\",\"ref\":"
- + "\"refs/changes/76/669676/2\",\"nodesCount\":1,\"type\":"
- + "\"ref-replication-done\",\"eventCreatedOn\":1451415011}";
- when(req.getReader())
- .thenReturn(new BufferedReader(new StringReader(event)));
- doThrow(new OrmException(ERR_MSG)).when(dispatcher)
+ String event =
+ "{\"project\":\"gerrit/some-project\",\"ref\":"
+ + "\"refs/changes/76/669676/2\",\"nodesCount\":1,\"type\":"
+ + "\"ref-replication-done\",\"eventCreatedOn\":1451415011}";
+ when(req.getReader()).thenReturn(new BufferedReader(new StringReader(event)));
+ doThrow(new OrmException(ERR_MSG))
+ .when(dispatcher)
.postEvent(any(RefReplicationDoneEvent.class));
eventRestApiServlet.doPost(req, rsp);
verify(rsp).sendError(SC_NOT_FOUND, "Change not found\n");
@@ -108,18 +100,17 @@
@Test
public void testDoPostWrongMediaType() throws Exception {
- when(req.getContentType())
- .thenReturn(MediaType.APPLICATION_XML_UTF_8.toString());
+ when(req.getContentType()).thenReturn(MediaType.APPLICATION_XML_UTF_8.toString());
eventRestApiServlet.doPost(req, rsp);
- verify(rsp).sendError(SC_UNSUPPORTED_MEDIA_TYPE,
- "Expecting " + JSON_UTF_8.toString() + " content type");
+ verify(rsp)
+ .sendError(
+ SC_UNSUPPORTED_MEDIA_TYPE, "Expecting " + JSON_UTF_8.toString() + " content type");
}
@Test
public void testDoPostErrorWhileSendingErrorMessage() throws Exception {
doThrow(new IOException(ERR_MSG)).when(req).getReader();
- doThrow(new IOException("someOtherError")).when(rsp)
- .sendError(SC_BAD_REQUEST, ERR_MSG);
+ doThrow(new IOException("someOtherError")).when(rsp).sendError(SC_BAD_REQUEST, ERR_MSG);
eventRestApiServlet.doPost(req, rsp);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java
index b72c21a..53f50a4 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java
@@ -16,11 +16,9 @@
import static com.google.common.truth.Truth.assertThat;
+import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
-
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
-
import org.junit.Test;
public class GsonParserTest {
@@ -30,33 +28,28 @@
public void AccountIDParse() {
Account.Id accountId = new Account.Id(1);
String json = GsonParser.toJson(Constants.ACCOUNTS, accountId);
- assertThat(accountId)
- .isEqualTo(GsonParser.fromJson(Constants.ACCOUNTS, json));
+ assertThat(accountId).isEqualTo(GsonParser.fromJson(Constants.ACCOUNTS, json));
}
@Test
public void AccountGroupIDParse() {
AccountGroup.Id accountGroupId = new AccountGroup.Id(1);
String json = GsonParser.toJson(Constants.GROUPS, accountGroupId);
- assertThat(accountGroupId)
- .isEqualTo(GsonParser.fromJson(Constants.GROUPS, json));
+ assertThat(accountGroupId).isEqualTo(GsonParser.fromJson(Constants.GROUPS, json));
}
@Test
public void AccountGroupUUIDParse() {
AccountGroup.UUID accountGroupUuid = new AccountGroup.UUID("abc123");
- String json =
- GsonParser.toJson(Constants.GROUPS_BYINCLUDE, accountGroupUuid);
- assertThat(accountGroupUuid)
- .isEqualTo(GsonParser.fromJson(Constants.GROUPS_BYINCLUDE, json));
+ String json = GsonParser.toJson(Constants.GROUPS_BYINCLUDE, accountGroupUuid);
+ assertThat(accountGroupUuid).isEqualTo(GsonParser.fromJson(Constants.GROUPS_BYINCLUDE, json));
}
@Test
public void StringParse() {
String key = "key";
String json = GsonParser.toJson(Constants.PROJECTS, key);
- assertThat(key)
- .isEqualTo(GsonParser.fromJson(Constants.PROJECTS, json));
+ assertThat(key).isEqualTo(GsonParser.fromJson(Constants.PROJECTS, json));
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProviderTest.java
index e039a3f..ac14ce4 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpClientProviderTest.java
@@ -17,13 +17,11 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Scopes;
-
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.Before;
import org.junit.Test;
@@ -36,8 +34,7 @@
private static final int TIME_INTERVAL = 1000;
private static final String EMPTY = "";
- @Mock
- private Configuration config;
+ @Mock private Configuration config;
@Before
public void setUp() throws Exception {
@@ -50,11 +47,9 @@
@Test
public void testGet() throws Exception {
Injector injector = Guice.createInjector(new TestModule());
- try (CloseableHttpClient httpClient1 =
- injector.getInstance(CloseableHttpClient.class)) {
+ try (CloseableHttpClient httpClient1 = injector.getInstance(CloseableHttpClient.class)) {
assertThat(httpClient1).isNotNull();
- try (CloseableHttpClient httpClient2 =
- injector.getInstance(CloseableHttpClient.class)) {
+ try (CloseableHttpClient httpClient2 = injector.getInstance(CloseableHttpClient.class)) {
assertThat(httpClient1).isEqualTo(httpClient2);
}
}
@@ -64,8 +59,7 @@
@Override
protected void configure() {
bind(Configuration.class).toInstance(config);
- bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class)
- .in(Scopes.SINGLETON);
+ bind(CloseableHttpClient.class).toProvider(HttpClientProvider.class).in(Scopes.SINGLETON);
}
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandlerTest.java
index ee8f9b4..69b8152 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpResponseHandlerTest.java
@@ -19,15 +19,13 @@
import static org.mockito.Mockito.when;
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
-
+import java.io.UnsupportedEncodingException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
-import java.io.UnsupportedEncodingException;
-
public class HttpResponseHandlerTest {
private static final int ERROR = 400;
private static final int NO_CONTENT = 204;
@@ -57,8 +55,7 @@
assertThat(result.getMessage()).contains(ERROR_ENTITY);
}
- private HttpResponse setupMocks(int httpCode, String entity)
- throws UnsupportedEncodingException {
+ private HttpResponse setupMocks(int httpCode, String entity) throws UnsupportedEncodingException {
StatusLine status = mock(StatusLine.class);
when(status.getStatusCode()).thenReturn(httpCode);
HttpResponse response = mock(HttpResponse.class);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
index bbf7800..19a50df 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
@@ -28,23 +28,20 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.google.common.base.Optional;
-import com.google.inject.util.Providers;
-
import com.ericsson.gerrit.plugins.highavailability.Configuration;
import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
import com.ericsson.gerrit.plugins.highavailability.peers.PeerInfo;
import com.github.tomakehurst.wiremock.http.Fault;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import com.github.tomakehurst.wiremock.stubbing.Scenario;
-
+import com.google.common.base.Optional;
+import com.google.inject.util.Providers;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-
public class HttpSessionTest {
private static final int MAX_TRIES = 3;
private static final int RETRY_INTERVAL = 250;
@@ -64,8 +61,7 @@
private HttpSession httpSession;
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(0);
+ @Rule public WireMockRule wireMockRule = new WireMockRule(0);
private Configuration cfg;
@@ -82,30 +78,31 @@
PeerInfo peerInfo = mock(PeerInfo.class);
when(peerInfo.getDirectUrl()).thenReturn(url);
- httpSession = new HttpSession(
- new HttpClientProvider(cfg).get(),
- Providers.of(Optional.of(peerInfo)));
+ httpSession =
+ new HttpSession(new HttpClientProvider(cfg).get(), Providers.of(Optional.of(peerInfo)));
}
@Test
public void testPostResponseOK() throws Exception {
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withStatus(NO_CONTENT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT)).willReturn(aResponse().withStatus(NO_CONTENT)));
assertThat(httpSession.post(ENDPOINT).isSuccessful()).isTrue();
}
@Test
public void testPostResponseWithContentOK() throws Exception {
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .withRequestBody(equalTo(BODY)).willReturn(aResponse().withStatus(NO_CONTENT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .withRequestBody(equalTo(BODY))
+ .willReturn(aResponse().withStatus(NO_CONTENT)));
assertThat(httpSession.post(ENDPOINT, BODY).isSuccessful()).isTrue();
}
@Test
public void testDeleteResponseOK() throws Exception {
- wireMockRule.givenThat(delete(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withStatus(NO_CONTENT)));
+ wireMockRule.givenThat(
+ delete(urlEqualTo(ENDPOINT)).willReturn(aResponse().withStatus(NO_CONTENT)));
assertThat(httpSession.delete(ENDPOINT).isSuccessful()).isTrue();
}
@@ -113,8 +110,9 @@
@Test
public void testNotAuthorized() throws Exception {
String expected = "unauthorized";
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withStatus(UNAUTHORIZED).withBody(expected)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .willReturn(aResponse().withStatus(UNAUTHORIZED).withBody(expected)));
HttpResult result = httpSession.post(ENDPOINT);
assertThat(result.isSuccessful()).isFalse();
@@ -124,8 +122,9 @@
@Test
public void testNotFound() throws Exception {
String expected = "not found";
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withStatus(NOT_FOUND).withBody(expected)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .willReturn(aResponse().withStatus(NOT_FOUND).withBody(expected)));
HttpResult result = httpSession.post(ENDPOINT);
assertThat(result.isSuccessful()).isFalse();
@@ -134,8 +133,9 @@
@Test
public void testBadResponseRetryThenGiveUp() throws Exception {
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withStatus(ERROR).withBody(ERROR_MESSAGE)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .willReturn(aResponse().withStatus(ERROR).withBody(ERROR_MESSAGE)));
HttpResult result = httpSession.post(ENDPOINT);
assertThat(result.isSuccessful()).isFalse();
@@ -144,35 +144,47 @@
@Test(expected = SocketTimeoutException.class)
public void testMaxRetriesAfterTimeoutThenGiveUp() throws Exception {
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT)).inScenario(RETRY_AT_DELAY)
- .whenScenarioStateIs(Scenario.STARTED).willSetStateTo(REQUEST_MADE)
- .willReturn(aResponse().withFixedDelay(TIMEOUT)));
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT)).inScenario(RETRY_AT_DELAY)
- .whenScenarioStateIs(REQUEST_MADE).willSetStateTo(SECOND_TRY)
- .willReturn(aResponse().withFixedDelay(TIMEOUT)));
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT)).inScenario(RETRY_AT_DELAY)
- .whenScenarioStateIs(SECOND_TRY).willSetStateTo(THIRD_TRY)
- .willReturn(aResponse().withFixedDelay(TIMEOUT)));
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT)).inScenario(RETRY_AT_DELAY)
- .whenScenarioStateIs(THIRD_TRY)
- .willReturn(aResponse().withFixedDelay(TIMEOUT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .inScenario(RETRY_AT_DELAY)
+ .whenScenarioStateIs(Scenario.STARTED)
+ .willSetStateTo(REQUEST_MADE)
+ .willReturn(aResponse().withFixedDelay(TIMEOUT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .inScenario(RETRY_AT_DELAY)
+ .whenScenarioStateIs(REQUEST_MADE)
+ .willSetStateTo(SECOND_TRY)
+ .willReturn(aResponse().withFixedDelay(TIMEOUT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .inScenario(RETRY_AT_DELAY)
+ .whenScenarioStateIs(SECOND_TRY)
+ .willSetStateTo(THIRD_TRY)
+ .willReturn(aResponse().withFixedDelay(TIMEOUT)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .inScenario(RETRY_AT_DELAY)
+ .whenScenarioStateIs(THIRD_TRY)
+ .willReturn(aResponse().withFixedDelay(TIMEOUT)));
httpSession.post(ENDPOINT);
}
@Test
public void testResponseWithMalformedResponse() throws Exception {
- wireMockRule.givenThat(post(urlEqualTo(ENDPOINT))
- .willReturn(aResponse().withFault(Fault.MALFORMED_RESPONSE_CHUNK)));
+ wireMockRule.givenThat(
+ post(urlEqualTo(ENDPOINT))
+ .willReturn(aResponse().withFault(Fault.MALFORMED_RESPONSE_CHUNK)));
assertThat(httpSession.post(ENDPOINT).isSuccessful()).isFalse();
}
@Test
public void testNoRequestWhenPeerInfoUnknown() throws IOException {
- httpSession = new HttpSession(
- new HttpClientProvider(cfg).get(),
- Providers.of(Optional.<PeerInfo> absent()));
+ httpSession =
+ new HttpSession(
+ new HttpClientProvider(cfg).get(), Providers.of(Optional.<PeerInfo>absent()));
try {
httpSession.post(ENDPOINT);
fail("Expected PeerInfoNotAvailableException");
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
index 8c81817..cc80fbb 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexAccountRestApiServletTest.java
@@ -25,7 +25,9 @@
import com.google.gerrit.server.index.account.AccountIndexer;
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.StandardKeyEncoder;
-
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,21 +35,13 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(MockitoJUnitRunner.class)
public class IndexAccountRestApiServletTest {
private static final String ACCOUNT_NUMBER = "1";
- @Mock
- private AccountIndexer indexer;
- @Mock
- private HttpServletRequest req;
- @Mock
- private HttpServletResponse rsp;
+ @Mock private AccountIndexer indexer;
+ @Mock private HttpServletRequest req;
+ @Mock private HttpServletResponse rsp;
private Account.Id id;
private IndexAccountRestApiServlet servlet;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
index 0f2f1d5..0c791b8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/IndexChangeRestApiServletTest.java
@@ -33,7 +33,9 @@
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.gwtorm.server.StandardKeyEncoder;
-
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,11 +43,6 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(MockitoJUnitRunner.class)
public class IndexChangeRestApiServletTest {
private static final boolean CHANGE_EXISTS = true;
@@ -56,16 +53,11 @@
private static final boolean THROW_ORM_EXCEPTION = true;
private static final String CHANGE_NUMBER = "1";
- @Mock
- private ChangeIndexer indexer;
- @Mock
- private SchemaFactory<ReviewDb> schemaFactory;
- @Mock
- private ReviewDb db;
- @Mock
- private HttpServletRequest req;
- @Mock
- private HttpServletResponse rsp;
+ @Mock private ChangeIndexer indexer;
+ @Mock private SchemaFactory<ReviewDb> schemaFactory;
+ @Mock private ReviewDb db;
+ @Mock private HttpServletRequest req;
+ @Mock private HttpServletResponse rsp;
private Change.Id id;
private Change change;
private IndexChangeRestApiServlet indexRestApiServlet;
@@ -108,8 +100,7 @@
@Test
public void indexerThrowsIOExceptionTryingToIndexChange() throws Exception {
- setupPostMocks(CHANGE_EXISTS, DO_NOT_THROW_ORM_EXCEPTION,
- THROW_IO_EXCEPTION);
+ setupPostMocks(CHANGE_EXISTS, DO_NOT_THROW_ORM_EXCEPTION, THROW_IO_EXCEPTION);
indexRestApiServlet.doPost(req, rsp);
verify(rsp).sendError(SC_CONFLICT, "io-error");
}
@@ -130,8 +121,9 @@
@Test
public void sendErrorThrowsIOException() throws Exception {
- doThrow(new IOException("someError")).when(rsp).sendError(SC_NOT_FOUND,
- "Error trying to find a change \n");
+ doThrow(new IOException("someError"))
+ .when(rsp)
+ .sendError(SC_NOT_FOUND, "Error trying to find a change \n");
setupPostMocks(CHANGE_EXISTS, THROW_ORM_EXCEPTION);
indexRestApiServlet.doPost(req, rsp);
verify(rsp).sendError(SC_NOT_FOUND, "Error trying to find a change \n");
@@ -139,8 +131,7 @@
}
private void setupPostMocks(boolean changeExist) throws Exception {
- setupPostMocks(changeExist, DO_NOT_THROW_ORM_EXCEPTION,
- DO_NOT_THROW_IO_EXCEPTION);
+ setupPostMocks(changeExist, DO_NOT_THROW_ORM_EXCEPTION, DO_NOT_THROW_IO_EXCEPTION);
}
private void setupPostMocks(boolean changeExist, boolean ormException)
@@ -148,8 +139,8 @@
setupPostMocks(changeExist, ormException, DO_NOT_THROW_IO_EXCEPTION);
}
- private void setupPostMocks(boolean changeExist, boolean ormException,
- boolean ioException) throws OrmException, IOException {
+ private void setupPostMocks(boolean changeExist, boolean ormException, boolean ioException)
+ throws OrmException, IOException {
if (ormException) {
doThrow(new OrmException("")).when(schemaFactory).open();
} else {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
index 3475e47..ce4d56b 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderTest.java
@@ -20,6 +20,9 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import com.ericsson.gerrit.plugins.highavailability.Configuration;
+import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
import com.google.common.base.Joiner;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
@@ -27,19 +30,12 @@
import com.google.gson.GsonBuilder;
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.StandardKeyEncoder;
-
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.cache.Constants;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.rest.HttpResponseHandler.HttpResult;
-
+import java.io.IOException;
+import javax.net.ssl.SSLException;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.IOException;
-
-import javax.net.ssl.SSLException;
-
public class RestForwarderTest {
private static final String PLUGIN_NAME = "high-availability";
private static final String EMPTY_MSG = "";
@@ -48,11 +44,11 @@
//Index
private static final int CHANGE_NUMBER = 1;
- private static final String INDEX_CHANGE_ENDPOINT = Joiner.on("/")
- .join("/plugins", PLUGIN_NAME, "index/change", CHANGE_NUMBER);
+ private static final String INDEX_CHANGE_ENDPOINT =
+ Joiner.on("/").join("/plugins", PLUGIN_NAME, "index/change", CHANGE_NUMBER);
private static final int ACCOUNT_NUMBER = 2;
- private static final String INDEX_ACCOUNT_ENDPOINT = Joiner.on("/")
- .join("/plugins", PLUGIN_NAME, "index/account", ACCOUNT_NUMBER);
+ private static final String INDEX_ACCOUNT_ENDPOINT =
+ Joiner.on("/").join("/plugins", PLUGIN_NAME, "index/account", ACCOUNT_NUMBER);
//Event
private static final String EVENT_ENDPOINT =
@@ -75,8 +71,7 @@
configurationMock = mock(Configuration.class);
when(configurationMock.getMaxTries()).thenReturn(3);
when(configurationMock.getRetryInterval()).thenReturn(10);
- forwarder =
- new RestForwarder(httpSessionMock, PLUGIN_NAME, configurationMock);
+ forwarder = new RestForwarder(httpSessionMock, PLUGIN_NAME, configurationMock);
}
@Test
@@ -95,8 +90,7 @@
@Test
public void testIndexAccountThrowsException() throws Exception {
- doThrow(new IOException()).when(httpSessionMock)
- .post(INDEX_ACCOUNT_ENDPOINT);
+ doThrow(new IOException()).when(httpSessionMock).post(INDEX_ACCOUNT_ENDPOINT);
assertThat(forwarder.indexAccount(ACCOUNT_NUMBER)).isFalse();
}
@@ -109,15 +103,13 @@
@Test
public void testIndexChangeFailed() throws Exception {
- when(httpSessionMock.post(INDEX_CHANGE_ENDPOINT))
- .thenReturn(new HttpResult(FAILED, EMPTY_MSG));
+ when(httpSessionMock.post(INDEX_CHANGE_ENDPOINT)).thenReturn(new HttpResult(FAILED, EMPTY_MSG));
assertThat(forwarder.indexChange(CHANGE_NUMBER)).isFalse();
}
@Test
public void testIndexChangeThrowsException() throws Exception {
- doThrow(new IOException()).when(httpSessionMock)
- .post(INDEX_CHANGE_ENDPOINT);
+ doThrow(new IOException()).when(httpSessionMock).post(INDEX_CHANGE_ENDPOINT);
assertThat(forwarder.indexChange(CHANGE_NUMBER)).isFalse();
}
@@ -137,8 +129,7 @@
@Test
public void testChangeDeletedFromThrowsException() throws Exception {
- doThrow(new IOException()).when(httpSessionMock)
- .delete(INDEX_CHANGE_ENDPOINT);
+ doThrow(new IOException()).when(httpSessionMock).delete(INDEX_CHANGE_ENDPOINT);
assertThat(forwarder.deleteChangeFromIndex(CHANGE_NUMBER)).isFalse();
}
@@ -158,8 +149,7 @@
@Test
public void testEventSentThrowsException() throws Exception {
- doThrow(new IOException()).when(httpSessionMock).post(EVENT_ENDPOINT,
- eventJson);
+ doThrow(new IOException()).when(httpSessionMock).post(EVENT_ENDPOINT, eventJson);
assertThat(forwarder.send(event)).isFalse();
}
@@ -192,21 +182,19 @@
@Test
public void testEvictGroupsByIncludeOK() throws Exception {
- AccountGroup.UUID key =
- AccountGroup.UUID.parse("90b3042d9094a37985f3f9281391dbbe9a5addad");
+ AccountGroup.UUID key = AccountGroup.UUID.parse("90b3042d9094a37985f3f9281391dbbe9a5addad");
String keyJson = new GsonBuilder().create().toJson(key);
- when(httpSessionMock.post(buildCacheEndpoint(Constants.GROUPS_BYINCLUDE),
- keyJson)).thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
+ when(httpSessionMock.post(buildCacheEndpoint(Constants.GROUPS_BYINCLUDE), keyJson))
+ .thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
assertThat(forwarder.evict(Constants.GROUPS_BYINCLUDE, key)).isTrue();
}
@Test
public void testEvictGroupsMembersOK() throws Exception {
- AccountGroup.UUID key =
- AccountGroup.UUID.parse("90b3042d9094a37985f3f9281391dbbe9a5addad");
+ AccountGroup.UUID key = AccountGroup.UUID.parse("90b3042d9094a37985f3f9281391dbbe9a5addad");
String keyJson = new GsonBuilder().create().toJson(key);
- when(httpSessionMock.post(buildCacheEndpoint(Constants.GROUPS_MEMBERS),
- keyJson)).thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
+ when(httpSessionMock.post(buildCacheEndpoint(Constants.GROUPS_MEMBERS), keyJson))
+ .thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
assertThat(forwarder.evict(Constants.GROUPS_MEMBERS, key)).isTrue();
}
@@ -214,8 +202,8 @@
public void testEvictProjectListOK() throws Exception {
String key = "all";
String keyJson = new GsonBuilder().create().toJson(key);
- when(httpSessionMock.post(buildCacheEndpoint(Constants.PROJECT_LIST),
- keyJson)).thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
+ when(httpSessionMock.post(buildCacheEndpoint(Constants.PROJECT_LIST), keyJson))
+ .thenReturn(new HttpResult(SUCCESSFUL, EMPTY_MSG));
assertThat(forwarder.evict(Constants.PROJECT_LIST, key)).isTrue();
}
@@ -232,7 +220,8 @@
public void testEvictCacheThrowsException() throws Exception {
String key = "projectName";
String keyJson = new GsonBuilder().create().toJson(key);
- doThrow(new IOException()).when(httpSessionMock)
+ doThrow(new IOException())
+ .when(httpSessionMock)
.post(buildCacheEndpoint(Constants.PROJECTS), keyJson);
assertThat(forwarder.evict(Constants.PROJECTS, key)).isFalse();
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
index 626af8b..e50d713 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
@@ -20,18 +20,16 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
+import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
+import com.ericsson.gerrit.plugins.highavailability.index.IndexEventHandler.IndexAccountTask;
+import com.ericsson.gerrit.plugins.highavailability.index.IndexEventHandler.IndexChangeTask;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.StandardKeyEncoder;
-
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Context;
-import com.ericsson.gerrit.plugins.highavailability.forwarder.Forwarder;
-import com.ericsson.gerrit.plugins.highavailability.index.IndexEventHandler.IndexAccountTask;
-import com.ericsson.gerrit.plugins.highavailability.index.IndexEventHandler.IndexChangeTask;
-
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -46,8 +44,7 @@
private static final int ACCOUNT_ID = 2;
private IndexEventHandler indexEventHandler;
- @Mock
- private Forwarder forwarder;
+ @Mock private Forwarder forwarder;
private Change.Id changeId;
private Account.Id accountId;
@@ -60,8 +57,8 @@
public void setUpMocks() {
changeId = Change.Id.parse(Integer.toString(CHANGE_ID));
accountId = Account.Id.parse(Integer.toString(ACCOUNT_ID));
- indexEventHandler = new IndexEventHandler(MoreExecutors.directExecutor(),
- PLUGIN_NAME, forwarder);
+ indexEventHandler =
+ new IndexEventHandler(MoreExecutors.directExecutor(), PLUGIN_NAME, forwarder);
}
@Test
@@ -77,8 +74,7 @@
}
@Test
- public void shouldDeleteFromIndexInRemoteOnChangeDeletedEvent()
- throws Exception {
+ public void shouldDeleteFromIndexInRemoteOnChangeDeletedEvent() throws Exception {
indexEventHandler.onChangeDeleted(changeId.get());
verify(forwarder).deleteChangeFromIndex(CHANGE_ID);
}
@@ -107,8 +103,7 @@
indexEventHandler = new IndexEventHandler(poolMock, PLUGIN_NAME, forwarder);
indexEventHandler.onChangeIndexed(changeId.get());
indexEventHandler.onChangeIndexed(changeId.get());
- verify(poolMock, times(1))
- .execute(indexEventHandler.new IndexChangeTask(CHANGE_ID, false));
+ verify(poolMock, times(1)).execute(indexEventHandler.new IndexChangeTask(CHANGE_ID, false));
}
@Test
@@ -117,35 +112,33 @@
indexEventHandler = new IndexEventHandler(poolMock, PLUGIN_NAME, forwarder);
indexEventHandler.onAccountIndexed(accountId.get());
indexEventHandler.onAccountIndexed(accountId.get());
- verify(poolMock, times(1))
- .execute(indexEventHandler.new IndexAccountTask(ACCOUNT_ID));
+ verify(poolMock, times(1)).execute(indexEventHandler.new IndexAccountTask(ACCOUNT_ID));
}
@Test
public void testIndexChangeTaskToString() throws Exception {
- IndexChangeTask task =
- indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
- assertThat(task.toString()).isEqualTo(String.format(
- "[%s] Index change %s in target instance", PLUGIN_NAME, CHANGE_ID));
+ IndexChangeTask task = indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
+ assertThat(task.toString())
+ .isEqualTo(
+ String.format("[%s] Index change %s in target instance", PLUGIN_NAME, CHANGE_ID));
}
@Test
public void testIndexAccountTaskToString() throws Exception {
IndexAccountTask task = indexEventHandler.new IndexAccountTask(ACCOUNT_ID);
- assertThat(task.toString()).isEqualTo(String.format(
- "[%s] Index account %s in target instance", PLUGIN_NAME, ACCOUNT_ID));
+ assertThat(task.toString())
+ .isEqualTo(
+ String.format("[%s] Index account %s in target instance", PLUGIN_NAME, ACCOUNT_ID));
}
@Test
public void testIndexChangeTaskHashCodeAndEquals() {
- IndexChangeTask task =
- indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
+ IndexChangeTask task = indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
assertThat(task.equals(task)).isTrue();
assertThat(task.hashCode()).isEqualTo(task.hashCode());
- IndexChangeTask identicalTask =
- indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
+ IndexChangeTask identicalTask = indexEventHandler.new IndexChangeTask(CHANGE_ID, false);
assertThat(task.equals(identicalTask)).isTrue();
assertThat(task.hashCode()).isEqualTo(identicalTask.hashCode());
@@ -153,13 +146,11 @@
assertThat(task.equals("test")).isFalse();
assertThat(task.hashCode()).isNotEqualTo("test".hashCode());
- IndexChangeTask differentChangeIdTask =
- indexEventHandler.new IndexChangeTask(123, false);
+ IndexChangeTask differentChangeIdTask = indexEventHandler.new IndexChangeTask(123, false);
assertThat(task.equals(differentChangeIdTask)).isFalse();
assertThat(task.hashCode()).isNotEqualTo(differentChangeIdTask.hashCode());
- IndexChangeTask removeTask =
- indexEventHandler.new IndexChangeTask(CHANGE_ID, true);
+ IndexChangeTask removeTask = indexEventHandler.new IndexChangeTask(CHANGE_ID, true);
assertThat(task.equals(removeTask)).isFalse();
assertThat(task.hashCode()).isNotEqualTo(removeTask.hashCode());
}
@@ -171,8 +162,7 @@
assertThat(task.equals(task)).isTrue();
assertThat(task.hashCode()).isEqualTo(task.hashCode());
- IndexAccountTask identicalTask =
- indexEventHandler.new IndexAccountTask(ACCOUNT_ID);
+ IndexAccountTask identicalTask = indexEventHandler.new IndexAccountTask(ACCOUNT_ID);
assertThat(task.equals(identicalTask)).isTrue();
assertThat(task.hashCode()).isEqualTo(identicalTask.hashCode());
@@ -180,10 +170,8 @@
assertThat(task.equals("test")).isFalse();
assertThat(task.hashCode()).isNotEqualTo("test".hashCode());
- IndexAccountTask differentAccountIdTask =
- indexEventHandler.new IndexAccountTask(123);
+ IndexAccountTask differentAccountIdTask = indexEventHandler.new IndexAccountTask(123);
assertThat(task.equals(differentAccountIdTask)).isFalse();
assertThat(task.hashCode()).isNotEqualTo(differentAccountIdTask.hashCode());
-
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
index 3db194b..66b84f1 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexExecutorProviderTest.java
@@ -19,10 +19,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.gerrit.server.git.WorkQueue;
-
import com.ericsson.gerrit.plugins.highavailability.Configuration;
-
+import com.google.gerrit.server.git.WorkQueue;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,20 +29,17 @@
@RunWith(MockitoJUnitRunner.class)
public class IndexExecutorProviderTest {
- @Mock
- private WorkQueue.Executor executorMock;
+ @Mock private WorkQueue.Executor executorMock;
private IndexExecutorProvider indexExecutorProvider;
@Before
public void setUp() throws Exception {
executorMock = mock(WorkQueue.Executor.class);
WorkQueue workQueueMock = mock(WorkQueue.class);
- when(workQueueMock.createQueue(4, "Forward-index-event"))
- .thenReturn(executorMock);
+ when(workQueueMock.createQueue(4, "Forward-index-event")).thenReturn(executorMock);
Configuration configMock = mock(Configuration.class);
when(configMock.getIndexThreadPoolSize()).thenReturn(4);
- indexExecutorProvider =
- new IndexExecutorProvider(workQueueMock, configMock);
+ indexExecutorProvider = new IndexExecutorProvider(workQueueMock, configMock);
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
index 56342e6..fe88d82 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheCleanerTest.java
@@ -27,30 +27,24 @@
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.inject.Provider;
-
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
@RunWith(MockitoJUnitRunner.class)
public class FileBasedWebSessionCacheCleanerTest {
private static long CLEANUP_INTERVAL = 5000;
private static String SOME_PLUGIN_NAME = "somePluginName";
- @Mock
- private Executor executorMock;
- @Mock
- private ScheduledFuture<?> scheduledFutureMock;
- @Mock
- private WorkQueue workQueueMock;
- @Mock
- private Provider<CleanupTask> cleanupTaskProviderMock;
+ @Mock private Executor executorMock;
+ @Mock private ScheduledFuture<?> scheduledFutureMock;
+ @Mock private WorkQueue workQueueMock;
+ @Mock private Provider<CleanupTask> cleanupTaskProviderMock;
private FileBasedWebSessionCacheCleaner cleaner;
@@ -58,10 +52,12 @@
public void setUp() {
when(cleanupTaskProviderMock.get()).thenReturn(new CleanupTask(null, null));
when(workQueueMock.getDefaultQueue()).thenReturn(executorMock);
- doReturn(scheduledFutureMock).when(executorMock).scheduleAtFixedRate(
- isA(CleanupTask.class), anyLong(), anyLong(), isA(TimeUnit.class));
- cleaner = new FileBasedWebSessionCacheCleaner(workQueueMock,
- cleanupTaskProviderMock, CLEANUP_INTERVAL);
+ doReturn(scheduledFutureMock)
+ .when(executorMock)
+ .scheduleAtFixedRate(isA(CleanupTask.class), anyLong(), anyLong(), isA(TimeUnit.class));
+ cleaner =
+ new FileBasedWebSessionCacheCleaner(
+ workQueueMock, cleanupTaskProviderMock, CLEANUP_INTERVAL);
}
@Test
@@ -78,15 +74,16 @@
@Test
public void testCleanupTaskToString() {
CleanupTask task = new CleanupTask(null, SOME_PLUGIN_NAME);
- assertThat(task.toString()).isEqualTo(String.format(
- "[%s] Clean up expired file based websessions", SOME_PLUGIN_NAME));
+ assertThat(task.toString())
+ .isEqualTo(String.format("[%s] Clean up expired file based websessions", SOME_PLUGIN_NAME));
}
@Test
public void testCleanupTaskIsScheduledOnStart() {
cleaner.start();
- verify(executorMock, times(1)).scheduleAtFixedRate(isA(CleanupTask.class),
- eq(1000l), eq(CLEANUP_INTERVAL), eq(TimeUnit.MILLISECONDS));
+ verify(executorMock, times(1))
+ .scheduleAtFixedRate(
+ isA(CleanupTask.class), eq(1000l), eq(CLEANUP_INTERVAL), eq(TimeUnit.MILLISECONDS));
}
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
index 22e8da9..a13575a 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
@@ -18,14 +18,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.httpd.WebSessionManager.Val;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeUtils;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.DirectoryStream;
@@ -38,6 +30,12 @@
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
public class FileBasedWebSessionCacheTest {
@@ -45,8 +43,7 @@
private static final String EMPTY_KEY = "aOc2prqlZRpSO3LpauGO5efCLs1L9r9KkG";
private static final String INVALID_KEY = "aOFdpHriBM6dN055M13PjDdTZagl5r5aSG";
- @Rule
- public TemporaryFolder tempFolder = new TemporaryFolder();
+ @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
private FileBasedWebsessionCache cache;
private Path websessionDir;
@@ -80,8 +77,7 @@
public void cleanUpTest() throws Exception {
loadKeyToCacheDir(EXISTING_KEY);
try {
- long existingKeyExpireAt =
- cache.getIfPresent(EXISTING_KEY).getExpiresAt();
+ long existingKeyExpireAt = cache.getIfPresent(EXISTING_KEY).getExpiresAt();
DateTimeUtils.setCurrentMillisFixed(
new DateTime(existingKeyExpireAt).minusHours(1).getMillis());
cache.cleanUp();
@@ -143,8 +139,7 @@
loadKeyToCacheDir(EMPTY_KEY);
loadKeyToCacheDir(INVALID_KEY);
loadKeyToCacheDir(EXISTING_KEY);
- List<String> keys =
- Arrays.asList(new String[] {EMPTY_KEY, EXISTING_KEY});
+ List<String> keys = Arrays.asList(new String[] {EMPTY_KEY, EXISTING_KEY});
assertThat(cache.getAllPresent(keys).size()).isEqualTo(1);
assertThat(cache.getAllPresent(keys)).containsKey(EXISTING_KEY);
}
@@ -271,7 +266,7 @@
}
private Path loadKeyToCacheDir(String key) throws IOException {
- if(key.equals(EMPTY_KEY)){
+ if (key.equals(EMPTY_KEY)) {
return Files.createFile(websessionDir.resolve(EMPTY_KEY));
}
InputStream in = loadFile(key);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModuleTest.java
index 669262c..2796169 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionModuleTest.java
@@ -21,7 +21,6 @@
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,32 +32,27 @@
private static String SOME_PLUGIN_NAME = "somePluginName";
- @Mock
- private PluginConfig configMock;
- @Mock
- private PluginConfigFactory pluginCfgFactoryMock;
+ @Mock private PluginConfig configMock;
+ @Mock private PluginConfigFactory pluginCfgFactoryMock;
private FileBasedWebsessionModule module;
@Before
public void setUp() throws Exception {
- when(pluginCfgFactoryMock.getFromGerritConfig(SOME_PLUGIN_NAME, true))
- .thenReturn(configMock);
+ when(pluginCfgFactoryMock.getFromGerritConfig(SOME_PLUGIN_NAME, true)).thenReturn(configMock);
module = new FileBasedWebsessionModule();
}
@Test
public void testDetCleanupIntervalDefaultValue() {
- assertThat(
- module.getCleanupInterval(pluginCfgFactoryMock, SOME_PLUGIN_NAME))
- .isEqualTo(HOURS.toMillis(24));
+ assertThat(module.getCleanupInterval(pluginCfgFactoryMock, SOME_PLUGIN_NAME))
+ .isEqualTo(HOURS.toMillis(24));
}
@Test
public void testDetCleanupIntervalConfiguredValue() {
when(configMock.getString("cleanupInterval")).thenReturn("30 seconds");
- assertThat(
- module.getCleanupInterval(pluginCfgFactoryMock, SOME_PLUGIN_NAME))
- .isEqualTo(SECONDS.toMillis(30));
+ assertThat(module.getCleanupInterval(pluginCfgFactoryMock, SOME_PLUGIN_NAME))
+ .isEqualTo(SECONDS.toMillis(30));
}
}
