Format all files with google-java-format 1.6
Change-Id: I2b1bc6c5c660bfe962e9ea1f8328e2615761fff4
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
index 80997a9..6364e97 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
@@ -18,26 +18,22 @@
import com.google.gerrit.server.events.EventListener;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.inject.Inject;
-
import java.util.concurrent.ScheduledExecutorService;
-/**
- * Listen to Events and store them into the EventStore
- */
+/** Listen to Events and store them into the EventStore */
class EventHandler implements EventListener {
private final EventStore store;
private final ScheduledExecutorService pool;
@Inject
- EventHandler(EventStore store,
- @EventPool ScheduledExecutorService pool) {
+ EventHandler(EventStore store, @EventPool ScheduledExecutorService pool) {
this.store = store;
this.pool = pool;
}
@Override
public void onEvent(Event event) {
- if(event instanceof ProjectEvent) {
+ if (event instanceof ProjectEvent) {
pool.execute(new StoreEventTask((ProjectEvent) event));
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java
index 3aa7e98..2851c03 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java
@@ -21,7 +21,6 @@
import com.google.inject.Provides;
import com.google.inject.Scopes;
import com.google.inject.internal.UniqueAnnotations;
-
import java.util.concurrent.ScheduledExecutorService;
/** Configures handling for an event queue while providing its pool. */
@@ -31,9 +30,7 @@
protected void configure() {
bind(EventQueue.class).in(Scopes.SINGLETON);
bind(EventHandler.class).in(Scopes.SINGLETON);
- bind(LifecycleListener.class)
- .annotatedWith(UniqueAnnotations.create())
- .to(EventQueue.class);
+ bind(LifecycleListener.class).annotatedWith(UniqueAnnotations.create()).to(EventQueue.class);
DynamicSet.bind(binder(), EventListener.class).to(EventHandler.class);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
index 1c3f536..2c7e962 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
@@ -17,13 +17,9 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
-/**
- * Annotation applied to a ScheduledExecutorService.
- */
+/** Annotation applied to a ScheduledExecutorService. */
@Retention(RUNTIME)
@BindingAnnotation
-public @interface EventPool {
-}
+public @interface EventPool {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java
index 5ec6bfd..334976f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java
@@ -17,7 +17,6 @@
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.git.WorkQueue;
import com.google.inject.Inject;
-
import java.util.concurrent.ScheduledExecutorService;
/** A queue for events to store. */
@@ -30,10 +29,7 @@
this.workQueue = workQueue;
}
- /**
- * {@inheritDoc}
- * Create a new executor queue in WorkQueue for storing events.
- */
+ /** {@inheritDoc} Create a new executor queue in WorkQueue for storing events. */
@Override
public void start() {
pool = workQueue.createQueue(1, "Store events");
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java
index 55e7e28..0b782f1 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java
@@ -15,7 +15,6 @@
package com.ericsson.gerrit.plugins.eventslog;
import com.google.gerrit.server.events.ProjectEvent;
-
import java.util.List;
/** A store for change events to query. */
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
index 6105be6..24dffe7 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
@@ -21,7 +21,6 @@
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -67,9 +66,7 @@
private String defaultUrl;
@Inject
- EventsLogConfig(PluginConfigFactory cfgFactory,
- SitePaths site,
- @PluginName String pluginName) {
+ EventsLogConfig(PluginConfigFactory cfgFactory, SitePaths site, @PluginName String pluginName) {
String defaultLocalPath = site.site_path.toString() + "/events-db/";
PluginConfig cfg = cfgFactory.getFromGerritConfig(pluginName, true);
copyLocal = cfg.getBoolean(CONFIG_COPY_LOCAL, DEFAULT_COPY_LOCAL);
@@ -81,8 +78,7 @@
storeDriver = cfg.getString(CONFIG_DRIVER, DEFAULT_DRIVER);
defaultUrl = "jdbc:h2:" + site.data_dir.toString() + "/db";
storeUrl = cfg.getString(CONFIG_URL, defaultUrl);
- localStorePath = Paths.get(cfg.getString(CONFIG_LOCAL_PATH,
- defaultLocalPath));
+ localStorePath = Paths.get(cfg.getString(CONFIG_LOCAL_PATH, defaultLocalPath));
urlOptions = concatenate(cfg.getStringList(CONFIG_URL_OPTIONS));
storeUsername = cfg.getString(CONFIG_USERNAME);
storePassword = cfg.getString(CONFIG_PASSWORD);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java
index 8b270bf..ad110ff 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java
@@ -19,8 +19,7 @@
private static final long serialVersionUID = 1L;
/**
- * Constructs an <code>EventsLogException</code> object with a given
- * <code>message</code>.
+ * Constructs an <code>EventsLogException</code> object with a given <code>message</code>.
*
* @param message a description of the exception
*/
@@ -29,12 +28,11 @@
}
/**
- * Constructs an <code>EventsLogException</code> object with a given
- * <code>message</code> and a given <code>cause</code>.
+ * Constructs an <code>EventsLogException</code> object with a given <code>message</code> and a
+ * given <code>cause</code>.
*
* @param message a description of the exception
- * @param cause the underlying reason for this
- * <code>EventsLogException</code>
+ * @param cause the underlying reason for this <code>EventsLogException</code>
*/
public EventsLogException(String message, Throwable cause) {
super(message, cause);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
index 03e5076..1258771 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
@@ -19,24 +19,20 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-
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 EventsRestApiServlet extends HttpServlet {
- private static final Logger log =
- LoggerFactory.getLogger(EventsRestApiServlet.class);
+ private static final Logger log = LoggerFactory.getLogger(EventsRestApiServlet.class);
private static final long serialVersionUID = 1L;
private final EventStore store;
@@ -44,9 +40,8 @@
private final Provider<CurrentUser> userProvider;
@Inject
- EventsRestApiServlet(EventStore store,
- QueryMaker queryMaker,
- Provider<CurrentUser> userProvider) {
+ EventsRestApiServlet(
+ EventStore store, QueryMaker queryMaker, Provider<CurrentUser> userProvider) {
this.store = store;
this.queryMaker = queryMaker;
this.userProvider = userProvider;
@@ -60,8 +55,7 @@
return;
}
rsp.setContentType("text/html");
- Map<String, String> params =
- req.getQueryString() != null ? getParameters(req) : null;
+ Map<String, String> params = req.getQueryString() != null ? getParameters(req) : null;
try (Writer out = rsp.getWriter()) {
String query = queryMaker.formQueryFromRequestParameters(params);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java
index 668fc29..dc98cc3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java
@@ -20,20 +20,16 @@
private static final String MESSAGE =
"Query doesn't conform with the format required by the database";
- /**
- * Constructs a <code>MalformedQueryException</code> object with the default
- * message.
- */
+ /** Constructs a <code>MalformedQueryException</code> object with the default message. */
public MalformedQueryException() {
super(MESSAGE);
}
/**
- * Constructs a <code>MalformedQueryException</code> object with the default
- * message and a given <code>cause</code>.
+ * Constructs a <code>MalformedQueryException</code> object with the default message and a given
+ * <code>cause</code>.
*
- * @param cause the underlying reason for this
- * <code>MalformedQueryException</code>
+ * @param cause the underlying reason for this <code>MalformedQueryException</code>
*/
public MalformedQueryException(Throwable cause) {
super(MESSAGE, cause);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java
index 8f1360f..ec04d34 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java
@@ -23,13 +23,11 @@
* Forms a String query based on the given parameters.
*
* @param params parameters which are used to form the query
- * @return a query based on the given parameters. The query should conform to
- * the format required by the database.
- * @throws MalformedQueryException if the given parameters do conform to
- * requirements
+ * @return a query based on the given parameters. The query should conform to the format required
+ * by the database.
+ * @throws MalformedQueryException if the given parameters do conform to requirements
*/
- String formQueryFromRequestParameters(Map<String, String> params)
- throws MalformedQueryException;
+ String formQueryFromRequestParameters(Map<String, String> params) throws MalformedQueryException;
/**
* Get the query designated as the default when no parameters are given.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java
index 5e93ea0..3684432 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java
@@ -17,13 +17,9 @@
/** An exception type for when the events database cannot be queried. */
public class ServiceUnavailableException extends EventsLogException {
private static final long serialVersionUID = 1L;
- private static final String MESSAGE =
- "Database server disconnected, cannot query events";
+ private static final String MESSAGE = "Database server disconnected, cannot query events";
- /**
- * Constructs a <code>ServiceUnavailableException</code> object with the
- * default message.
- */
+ /** Constructs a <code>ServiceUnavailableException</code> object with the default message. */
public ServiceUnavailableException() {
super(MESSAGE);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java
index 319871c..eb589f7 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java
@@ -17,13 +17,9 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
-/**
- * Annotation applied to the SQLClient connected to the main database
- */
+/** Annotation applied to the SQLClient connected to the main database */
@Retention(RUNTIME)
@BindingAnnotation
-public @interface EventsDb {
-}
+public @interface EventsDb {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java
index d3509f6..bd93ec3 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java
@@ -17,13 +17,9 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import com.google.inject.BindingAnnotation;
-
import java.lang.annotation.Retention;
-/**
- * Annotation applied to the SQLClient connected to the local database
- */
+/** Annotation applied to the SQLClient connected to the local database */
@Retention(RUNTIME)
@BindingAnnotation
-@interface LocalEventsDb {
-}
+@interface LocalEventsDb {}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
index d4ae595..68ef630 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
@@ -24,22 +24,16 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
+import com.ericsson.gerrit.plugins.eventslog.EventsLogException;
+import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
import com.google.common.base.Supplier;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.events.ProjectEvent;
+import com.google.gerrit.server.events.SupplierSerializer;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.inject.Inject;
-import com.google.gerrit.server.events.SupplierSerializer;
-
-import com.ericsson.gerrit.plugins.eventslog.EventsLogException;
-import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
-
-import org.apache.commons.dbcp.BasicDataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -47,6 +41,9 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class SQLClient {
private static final Logger log = LoggerFactory.getLogger(SQLClient.class);
@@ -59,8 +56,7 @@
ds.setDriverClassName(storeDriver);
ds.setUrl(storeUrl);
ds.setConnectionProperties(urlOptions);
- gson = new GsonBuilder()
- .registerTypeAdapter(Supplier.class, new SupplierSerializer()).create();
+ gson = new GsonBuilder().registerTypeAdapter(Supplier.class, new SupplierSerializer()).create();
}
/**
@@ -82,8 +78,7 @@
}
/**
- * Set the time before an idle connection is evicted as well as the
- * time between eviction runs.
+ * Set the time before an idle connection is evicted as well as the time between eviction runs.
*
* @param evictIdleTime the time in milliseconds before eviction
*/
@@ -110,8 +105,7 @@
*/
boolean dbExists() throws SQLException {
try (Connection conn = ds.getConnection();
- ResultSet tables =
- conn.getMetaData().getTables(null, null, TABLE_NAME, null)) {
+ ResultSet tables = conn.getMetaData().getTables(null, null, TABLE_NAME, null)) {
return tables.next();
}
}
@@ -125,15 +119,14 @@
}
/**
- * Get events as a multimap list of Strings and SQLEntries. The String
- * represents the project name, and the SQLEntry is the event information.
+ * Get events as a multimap list of Strings and SQLEntries. The String represents the project
+ * name, and the SQLEntry is the event information.
*
* @param query the query as a string
* @return Multimap list of Strings (project names) and SQLEntries (events)
* @throws EventsLogException If there was a problem with the database
*/
- ListMultimap<String, SQLEntry> getEvents(String query)
- throws EventsLogException {
+ ListMultimap<String, SQLEntry> getEvents(String query) throws EventsLogException {
try (Connection conn = ds.getConnection();
Statement stat = conn.createStatement()) {
return listEvents(stat, query);
@@ -149,7 +142,8 @@
* @throws SQLException If there was a problem with the database
*/
void storeEvent(ProjectEvent event) throws SQLException {
- storeEvent(event.getProjectNameKey().get(),
+ storeEvent(
+ event.getProjectNameKey().get(),
new Timestamp(SECONDS.toMillis(event.eventCreatedOn)),
gson.toJson(event));
}
@@ -162,11 +156,10 @@
* @param event The event as a string
* @throws SQLException If there was a problem with the database
*/
- void storeEvent(String projectName, Timestamp timestamp, String event)
- throws SQLException {
- execute(format("INSERT INTO %s(%s, %s, %s) ", TABLE_NAME, PROJECT_ENTRY,
- DATE_ENTRY, EVENT_ENTRY)
- + format("VALUES('%s', '%s', '%s')", projectName, timestamp, event));
+ void storeEvent(String projectName, Timestamp timestamp, String event) throws SQLException {
+ execute(
+ format("INSERT INTO %s(%s, %s, %s) ", TABLE_NAME, PROJECT_ENTRY, DATE_ENTRY, EVENT_ENTRY)
+ + format("VALUES('%s', '%s', '%s')", projectName, timestamp, event));
}
/**
@@ -176,12 +169,12 @@
*/
void removeOldEvents(int maxAge) {
try {
- execute(format(
- "DELETE FROM %s WHERE %s < '%s'",
- TABLE_NAME,
- DATE_ENTRY,
- new Timestamp(System.currentTimeMillis()
- - MILLISECONDS.convert(maxAge, DAYS))));
+ execute(
+ format(
+ "DELETE FROM %s WHERE %s < '%s'",
+ TABLE_NAME,
+ DATE_ENTRY,
+ new Timestamp(System.currentTimeMillis() - MILLISECONDS.convert(maxAge, DAYS))));
} catch (SQLException e) {
log.warn("Cannot remove old event entries from database", e);
}
@@ -194,17 +187,15 @@
*/
void removeProjectEvents(String project) {
try {
- execute(
- format("DELETE FROM %s WHERE project = '%s'", TABLE_NAME, project));
+ execute(format("DELETE FROM %s WHERE project = '%s'", TABLE_NAME, project));
} catch (SQLException e) {
- log.warn(
- "Cannot remove project " + project + " events from database", e);
+ log.warn("Cannot remove project " + project + " events from database", e);
}
}
/**
- * Do a simple query on the database. This is used to determine whether or
- * not the main database is online.
+ * Do a simple query on the database. This is used to determine whether or not the main database
+ * is online.
*
* @throws SQLException If there was a problem with the database
*/
@@ -224,9 +215,12 @@
Statement stat = conn.createStatement();
ResultSet rs = stat.executeQuery("SELECT * FROM " + TABLE_NAME)) {
while (rs.next()) {
- entries.add(new SQLEntry(rs.getString(PROJECT_ENTRY), rs
- .getTimestamp(DATE_ENTRY), rs.getString(EVENT_ENTRY), rs
- .getInt(PRIMARY_ENTRY)));
+ entries.add(
+ new SQLEntry(
+ rs.getString(PROJECT_ENTRY),
+ rs.getTimestamp(DATE_ENTRY),
+ rs.getString(EVENT_ENTRY),
+ rs.getInt(PRIMARY_ENTRY)));
}
return entries;
}
@@ -238,8 +232,10 @@
ListMultimap<String, SQLEntry> result = ArrayListMultimap.create();
while (rs.next()) {
SQLEntry entry =
- new SQLEntry(rs.getString(PROJECT_ENTRY),
- rs.getTimestamp(DATE_ENTRY), rs.getString(EVENT_ENTRY),
+ new SQLEntry(
+ rs.getString(PROJECT_ENTRY),
+ rs.getTimestamp(DATE_ENTRY),
+ rs.getString(EVENT_ENTRY),
rs.getInt(PRIMARY_ENTRY));
result.put(rs.getString(PROJECT_ENTRY), entry);
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
index e8f0559..6b9639c 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
@@ -14,17 +14,16 @@
package com.ericsson.gerrit.plugins.eventslog.sql;
+import com.ericsson.gerrit.plugins.eventslog.EventModule;
+import com.ericsson.gerrit.plugins.eventslog.EventStore;
+import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
+import com.ericsson.gerrit.plugins.eventslog.QueryMaker;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.internal.UniqueAnnotations;
-import com.ericsson.gerrit.plugins.eventslog.EventModule;
-import com.ericsson.gerrit.plugins.eventslog.EventStore;
-import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
-import com.ericsson.gerrit.plugins.eventslog.QueryMaker;
-
class SQLModule extends AbstractModule {
private static final String H2_DB_PREFIX = "jdbc:h2:";
@@ -33,8 +32,7 @@
protected void configure() {
install(new EventModule());
bind(EventStore.class).to(SQLStore.class);
- bind(LifecycleListener.class).annotatedWith(UniqueAnnotations.create()).to(
- SQLStore.class);
+ bind(LifecycleListener.class).annotatedWith(UniqueAnnotations.create()).to(SQLStore.class);
bind(QueryMaker.class).to(SQLQueryMaker.class);
}
@@ -42,8 +40,8 @@
@Singleton
@EventsDb
SQLClient provideSqlClient(EventsLogConfig cfg) {
- SQLClient sqlClient = new SQLClient(cfg.getStoreDriver(), cfg.getStoreUrl(),
- cfg.getUrlOptions());
+ SQLClient sqlClient =
+ new SQLClient(cfg.getStoreDriver(), cfg.getStoreUrl(), cfg.getUrlOptions());
sqlClient.setUsername(cfg.getStoreUsername());
sqlClient.setPassword(cfg.getStorePassword());
sqlClient.setEvictIdleTime(cfg.getEvictIdleTime());
@@ -56,8 +54,11 @@
SQLClient provideLocalSqlClient(EventsLogConfig cfg) {
String path = cfg.getLocalStorePath().toString();
path = path.endsWith("/") ? path : path + "/";
- SQLClient sqlClient = new SQLClient(cfg.getLocalStoreDriver(),
- H2_DB_PREFIX + path + SQLTable.TABLE_NAME, cfg.getUrlOptions());
+ SQLClient sqlClient =
+ new SQLClient(
+ cfg.getLocalStoreDriver(),
+ H2_DB_PREFIX + path + SQLTable.TABLE_NAME,
+ cfg.getUrlOptions());
sqlClient.setEvictIdleTime(cfg.getEvictIdleTime());
return sqlClient;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
index 74a4465..b79cc09 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
@@ -18,13 +18,11 @@
import static com.ericsson.gerrit.plugins.eventslog.sql.SQLTable.PRIMARY_ENTRY;
import static com.ericsson.gerrit.plugins.eventslog.sql.SQLTable.TABLE_NAME;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
import com.ericsson.gerrit.plugins.eventslog.QueryMaker;
-
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -61,15 +59,22 @@
throw new MalformedQueryException(e);
}
return String.format(
- "SELECT * FROM %s WHERE %s BETWEEN '%s' and '%s' LIMIT %d", TABLE_NAME,
- DATE_ENTRY, dates[0], dates[1], returnLimit);
+ "SELECT * FROM %s WHERE %s BETWEEN '%s' and '%s' LIMIT %d",
+ TABLE_NAME, DATE_ENTRY, dates[0], dates[1], returnLimit);
}
@Override
public String getDefaultQuery() {
- return "SELECT * FROM(SELECT * FROM " + TABLE_NAME
- + " ORDER BY " + PRIMARY_ENTRY + " DESC LIMIT " + returnLimit + ")"
- + " a ORDER BY " + PRIMARY_ENTRY + " ASC";
+ return "SELECT * FROM(SELECT * FROM "
+ + TABLE_NAME
+ + " ORDER BY "
+ + PRIMARY_ENTRY
+ + " DESC LIMIT "
+ + returnLimit
+ + ")"
+ + " a ORDER BY "
+ + PRIMARY_ENTRY
+ + " ASC";
}
private String[] parseDates(String dateOne, String dateTwo)
@@ -77,16 +82,13 @@
if (dateOne == null && dateTwo == null) {
throw new MalformedQueryException();
}
- LocalDateTime dOne =
- dateOne == null ? LocalDateTime.now() : parseDate(dateOne);
- LocalDateTime dTwo =
- dateTwo == null ? LocalDateTime.now() : parseDate(dateTwo);
+ LocalDateTime dOne = dateOne == null ? LocalDateTime.now() : parseDate(dateOne);
+ LocalDateTime dTwo = dateTwo == null ? LocalDateTime.now() : parseDate(dateTwo);
LocalDateTime[] dates = new LocalDateTime[TWO];
dates[0] = dOne.isBefore(dTwo) ? dOne : dTwo;
dates[1] = dOne.isBefore(dTwo) ? dTwo : dOne;
- return new String[] {DATE_TIME_FORMAT.format(dates[0]),
- DATE_TIME_FORMAT.format(dates[1])};
+ return new String[] {DATE_TIME_FORMAT.format(dates[0]), DATE_TIME_FORMAT.format(dates[1])};
}
private LocalDateTime parseDate(String date) throws DateTimeParseException {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
index 920f5d7..72ed8fb 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -16,6 +16,11 @@
import static com.ericsson.gerrit.plugins.eventslog.sql.SQLTable.TABLE_NAME;
+import com.ericsson.gerrit.plugins.eventslog.EventPool;
+import com.ericsson.gerrit.plugins.eventslog.EventStore;
+import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
+import com.ericsson.gerrit.plugins.eventslog.EventsLogException;
+import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
import com.google.common.io.Files;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.events.LifecycleListener;
@@ -27,16 +32,6 @@
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
-import com.ericsson.gerrit.plugins.eventslog.EventPool;
-import com.ericsson.gerrit.plugins.eventslog.EventStore;
-import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
-import com.ericsson.gerrit.plugins.eventslog.EventsLogException;
-import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.File;
import java.io.IOException;
import java.net.ConnectException;
@@ -47,9 +42,11 @@
import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
-import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
class SQLStore implements EventStore, LifecycleListener {
@@ -70,7 +67,8 @@
private Path localPath;
@Inject
- SQLStore(EventsLogConfig cfg,
+ SQLStore(
+ EventsLogConfig cfg,
@EventsDb SQLClient eventsDb,
@LocalEventsDb SQLClient localEventsDb,
@EventPool ScheduledExecutorService pool,
@@ -100,9 +98,8 @@
}
/**
- * {@inheritDoc}
- * The events returned are restricted to the projects which are visible to
- * the user.
+ * {@inheritDoc} The events returned are restricted to the projects which are visible to the user.
+ *
* @throws ServiceUnavailableException if working in offline mode
*/
@Override
@@ -112,8 +109,7 @@
}
List<SQLEntry> entries = new ArrayList<>();
- for (Entry<String, Collection<SQLEntry>> entry
- : eventsDb.getEvents(query).asMap().entrySet()) {
+ for (Entry<String, Collection<SQLEntry>> entry : eventsDb.getEvents(query).asMap().entrySet()) {
String projectName = entry.getKey();
try {
permissionBackend
@@ -140,10 +136,9 @@
}
/**
- * {@inheritDoc}
- * If storing the event fails due to a connection problem, storage will be
- * re-attempted as specified in gerrit.config. After failing the maximum
- * amount of times, the event will be stored in a local h2 database.
+ * {@inheritDoc} If storing the event fails due to a connection problem, storage will be
+ * re-attempted as specified in gerrit.config. After failing the maximum amount of times, the
+ * event will be stored in a local h2 database.
*/
@Override
public void storeEvent(ProjectEvent event) {
@@ -165,8 +160,7 @@
try {
retryIfAllowed(failedConnections);
} catch (InterruptedException e1) {
- log.warn("Cannot store ChangeEvent for: " + projectName.get()
- + ": Interrupted");
+ log.warn("Cannot store ChangeEvent for: " + projectName.get() + ": Interrupted");
Thread.currentThread().interrupt();
return;
}
@@ -176,8 +170,7 @@
}
}
- private void retryIfAllowed(int failedConnections)
- throws InterruptedException {
+ private void retryIfAllowed(int failedConnections) throws InterruptedException {
if (failedConnections < maxTries - 1) {
log.info("Retrying store event");
Thread.sleep(waitTime);
@@ -191,8 +184,10 @@
try {
getEventsDb().createDBIfNotCreated();
} catch (SQLException e) {
- log.warn("Cannot start the database. Events will be stored locally"
- + " until database connection can be established", e);
+ log.warn(
+ "Cannot start the database. Events will be stored locally"
+ + " until database connection can be established",
+ e);
setOnline(false);
}
if (online) {
@@ -209,8 +204,9 @@
this.online = online;
setUp();
if (!online) {
- checkConnTask = pool.scheduleWithFixedDelay(
- new CheckConnectionTask(), 0, connectTime, TimeUnit.MILLISECONDS);
+ checkConnTask =
+ pool.scheduleWithFixedDelay(
+ new CheckConnectionTask(), 0, connectTime, TimeUnit.MILLISECONDS);
} else {
cancelCheckConnectionTaskIfScheduled(false);
}
@@ -244,16 +240,14 @@
private void restoreEvent(SQLEntry entry) {
try {
- eventsDb.storeEvent(entry.getName(), entry.getTimestamp(),
- entry.getEvent());
+ eventsDb.storeEvent(entry.getName(), entry.getTimestamp(), entry.getEvent());
} catch (SQLException e) {
log.warn("Could not restore events from local", e);
}
}
class CheckConnectionTask implements Runnable {
- CheckConnectionTask() {
- }
+ CheckConnectionTask() {}
@Override
public void run() {
@@ -285,9 +279,7 @@
try {
exists = localEventsDb.dbExists();
} catch (SQLException e) {
- log.warn(
- "Could not check existence of local database, assume that it doesn't exist",
- e);
+ log.warn("Could not check existence of local database, assume that it doesn't exist", e);
}
return exists;
}
@@ -297,9 +289,11 @@
return;
}
File file = localPath.resolve(TABLE_NAME + H2_DB_SUFFIX).toFile();
- File copyFile = localPath.resolve(TABLE_NAME
- + (TimeUnit.MILLISECONDS.toSeconds(TimeUtil.nowMs()))
- + H2_DB_SUFFIX).toFile();
+ File copyFile =
+ localPath
+ .resolve(
+ TABLE_NAME + (TimeUnit.MILLISECONDS.toSeconds(TimeUtil.nowMs())) + H2_DB_SUFFIX)
+ .toFile();
try {
Files.copy(file, copyFile);
} catch (IOException e) {
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java
index 114f654..3de5229 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java
@@ -23,8 +23,7 @@
static final String DATE_ENTRY = "date_created";
static final String EVENT_ENTRY = "event_info";
- private SQLTable() {
- }
+ private SQLTable() {}
static String createTableQuery(boolean postgresql) {
StringBuilder query = new StringBuilder();
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
index af1cfa8..bdebed8 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
@@ -21,20 +21,17 @@
import com.google.gerrit.server.events.ChangeEvent;
import com.google.gerrit.server.events.Event;
-
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
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.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-
@RunWith(MockitoJUnitRunner.class)
public class EventHandlerTest {
- @Mock
- private EventStore storeMock;
+ @Mock private EventStore storeMock;
private EventHandler eventHandler;
@Before
@@ -61,6 +58,7 @@
PoolMock() {
super(1);
}
+
@Override
public void execute(Runnable command) {
assertThat(command.toString()).isEqualTo("(Events-log) Insert Event");
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java
index f1f6a07..f406f8f 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java
@@ -42,7 +42,8 @@
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.SitePaths;
-
+import java.io.IOException;
+import java.nio.file.Files;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -51,9 +52,6 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.IOException;
-import java.nio.file.Files;
-
@RunWith(MockitoJUnitRunner.class)
public class EventsLogConfigTest {
private static final String PLUGIN_NAME = "eventsLog";
@@ -66,13 +64,10 @@
private String localStorePath;
private String[] urlOptions = new String[] {"DB_CLOSE_DELAY=10"};
- @Mock
- private PluginConfigFactory cfgFactoryMock;
- @Mock
- private PluginConfig configMock;
+ @Mock private PluginConfigFactory cfgFactoryMock;
+ @Mock private PluginConfig configMock;
- @Rule
- public TemporaryFolder gerrit_site = new TemporaryFolder();
+ @Rule public TemporaryFolder gerrit_site = new TemporaryFolder();
@Before
public void setUp() throws IOException {
@@ -80,30 +75,23 @@
Files.createDirectories(site.etc_dir);
defaultLocalStorePath = site.site_path.toString() + "/events-db/";
defaultUrl = "jdbc:h2:" + site.data_dir.toString() + "/db";
- when(cfgFactoryMock.getFromGerritConfig(PLUGIN_NAME, true))
- .thenReturn(configMock);
+ when(cfgFactoryMock.getFromGerritConfig(PLUGIN_NAME, true)).thenReturn(configMock);
}
private void setUpDefaults() {
when(configMock.getBoolean(CONFIG_COPY_LOCAL, DEFAULT_COPY_LOCAL))
.thenReturn(DEFAULT_COPY_LOCAL);
- when(configMock.getInt(CONFIG_MAX_AGE, DEFAULT_MAX_AGE))
- .thenReturn(DEFAULT_MAX_AGE);
- when(configMock.getInt(CONFIG_MAX_TRIES, DEFAULT_MAX_TRIES))
- .thenReturn(DEFAULT_MAX_TRIES);
+ when(configMock.getInt(CONFIG_MAX_AGE, DEFAULT_MAX_AGE)).thenReturn(DEFAULT_MAX_AGE);
+ when(configMock.getInt(CONFIG_MAX_TRIES, DEFAULT_MAX_TRIES)).thenReturn(DEFAULT_MAX_TRIES);
when(configMock.getInt(CONFIG_RETURN_LIMIT, DEFAULT_RETURN_LIMIT))
.thenReturn(DEFAULT_RETURN_LIMIT);
- when(configMock.getInt(CONFIG_CONN_TIME, DEFAULT_CONN_TIME))
- .thenReturn(DEFAULT_CONN_TIME);
- when(configMock.getInt(CONFIG_WAIT_TIME, DEFAULT_WAIT_TIME))
- .thenReturn(DEFAULT_WAIT_TIME);
- when(configMock.getString(CONFIG_DRIVER, DEFAULT_DRIVER))
- .thenReturn(DEFAULT_DRIVER);
+ when(configMock.getInt(CONFIG_CONN_TIME, DEFAULT_CONN_TIME)).thenReturn(DEFAULT_CONN_TIME);
+ when(configMock.getInt(CONFIG_WAIT_TIME, DEFAULT_WAIT_TIME)).thenReturn(DEFAULT_WAIT_TIME);
+ when(configMock.getString(CONFIG_DRIVER, DEFAULT_DRIVER)).thenReturn(DEFAULT_DRIVER);
when(configMock.getString(CONFIG_URL, defaultUrl)).thenReturn(defaultUrl);
when(configMock.getString(CONFIG_LOCAL_PATH, defaultLocalStorePath))
.thenReturn(defaultLocalStorePath);
- when(configMock.getStringList(CONFIG_URL_OPTIONS))
- .thenReturn(new String[] {});
+ when(configMock.getStringList(CONFIG_URL_OPTIONS)).thenReturn(new String[] {});
when(configMock.getString(CONFIG_USERNAME)).thenReturn(null);
when(configMock.getString(CONFIG_PASSWORD)).thenReturn(null);
when(configMock.getInt(CONFIG_EVICT_IDLE_TIME, DEFAULT_EVICT_IDLE_TIME))
@@ -112,28 +100,20 @@
private void setUpCustom() {
localStorePath = "~/gerrit/events-db/";
- when(configMock.getBoolean(CONFIG_COPY_LOCAL, DEFAULT_COPY_LOCAL))
- .thenReturn(true);
+ when(configMock.getBoolean(CONFIG_COPY_LOCAL, DEFAULT_COPY_LOCAL)).thenReturn(true);
when(configMock.getInt(CONFIG_MAX_AGE, DEFAULT_MAX_AGE)).thenReturn(20);
when(configMock.getInt(CONFIG_MAX_TRIES, DEFAULT_MAX_TRIES)).thenReturn(5);
- when(configMock.getInt(CONFIG_RETURN_LIMIT, DEFAULT_RETURN_LIMIT))
- .thenReturn(10000);
- when(configMock.getInt(CONFIG_CONN_TIME, DEFAULT_CONN_TIME))
- .thenReturn(5000);
- when(configMock.getInt(CONFIG_WAIT_TIME, DEFAULT_WAIT_TIME))
- .thenReturn(5000);
- when(configMock.getString(CONFIG_DRIVER, DEFAULT_DRIVER))
- .thenReturn("org.h2.Driver2");
- when(configMock.getString(CONFIG_URL, defaultUrl))
- .thenReturn("jdbc:h2:~/gerrit/db");
- when(configMock.getString(CONFIG_LOCAL_PATH, defaultLocalStorePath))
- .thenReturn(localStorePath);
+ when(configMock.getInt(CONFIG_RETURN_LIMIT, DEFAULT_RETURN_LIMIT)).thenReturn(10000);
+ when(configMock.getInt(CONFIG_CONN_TIME, DEFAULT_CONN_TIME)).thenReturn(5000);
+ when(configMock.getInt(CONFIG_WAIT_TIME, DEFAULT_WAIT_TIME)).thenReturn(5000);
+ when(configMock.getString(CONFIG_DRIVER, DEFAULT_DRIVER)).thenReturn("org.h2.Driver2");
+ when(configMock.getString(CONFIG_URL, defaultUrl)).thenReturn("jdbc:h2:~/gerrit/db");
+ when(configMock.getString(CONFIG_LOCAL_PATH, defaultLocalStorePath)).thenReturn(localStorePath);
when(configMock.getStringList(CONFIG_URL_OPTIONS)).thenReturn(urlOptions);
when(configMock.getString(CONFIG_USERNAME)).thenReturn("testUsername");
when(configMock.getString(CONFIG_PASSWORD)).thenReturn("testPassword");
when(configMock.getInt(CONFIG_EVICT_IDLE_TIME, DEFAULT_EVICT_IDLE_TIME))
.thenReturn(CUSTOM_EVICT_IDLE_TIME);
-
}
@Test
@@ -147,8 +127,7 @@
assertThat(config.getConnectTime()).isEqualTo(1000);
assertThat(config.getWaitTime()).isEqualTo(1000);
assertThat(config.getLocalStoreDriver()).isEqualTo(DEFAULT_DRIVER);
- assertThat(config.getLocalStorePath().toString() + "/")
- .isEqualTo(defaultLocalStorePath);
+ assertThat(config.getLocalStorePath().toString() + "/").isEqualTo(defaultLocalStorePath);
assertThat(config.getStoreDriver()).isEqualTo(DEFAULT_DRIVER);
assertThat(config.getStoreUrl()).isEqualTo(defaultUrl);
assertThat(config.getUrlOptions()).isEmpty();
@@ -168,12 +147,10 @@
assertThat(config.getConnectTime()).isEqualTo(5000);
assertThat(config.getWaitTime()).isEqualTo(5000);
assertThat(config.getLocalStoreDriver()).isEqualTo(DEFAULT_DRIVER);
- assertThat(config.getLocalStorePath().toString() + "/")
- .isEqualTo(localStorePath);
+ assertThat(config.getLocalStorePath().toString() + "/").isEqualTo(localStorePath);
assertThat(config.getStoreDriver()).isEqualTo("org.h2.Driver2");
assertThat(config.getStoreUrl()).isEqualTo("jdbc:h2:~/gerrit/db");
- assertThat(config.getUrlOptions())
- .isEqualTo(Joiner.on(";").join(urlOptions));
+ assertThat(config.getUrlOptions()).isEqualTo(Joiner.on(";").join(urlOptions));
assertThat(config.getStoreUsername()).isEqualTo("testUsername");
assertThat(config.getStorePassword()).isEqualTo("testPassword");
assertThat(config.getEvictIdleTime()).isEqualTo(CUSTOM_EVICT_IDLE_TIME);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
index af0180b..1d2ca32 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogIT.java
@@ -19,14 +19,12 @@
import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.TestPlugin;
-
import org.junit.Test;
@TestPlugin(
name = "events-log",
sysModule = "com.ericsson.gerrit.plugins.eventslog.sql.SQLModule",
- httpModule = "com.ericsson.gerrit.plugins.eventslog.HttpModule"
-)
+ httpModule = "com.ericsson.gerrit.plugins.eventslog.HttpModule")
public class EventsLogIT extends LightweightPluginDaemonTest {
@Test
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java
index e06f199..ea026d5 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java
@@ -23,7 +23,12 @@
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.server.CurrentUser;
import com.google.inject.Provider;
-
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,39 +37,23 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(MockitoJUnitRunner.class)
public class EventsRestApiServletTest {
private static final String RANDOM_QUERY = "random query";
- @Mock
- private EventStore storeMock;
- @Mock
- private QueryMaker queryMakerMock;
- @Mock
- private Provider<CurrentUser> userProviderMock;
- @Mock
- private CurrentUser userMock;
- @Mock
- private HttpServletRequest reqMock;
- @Mock
- private HttpServletResponse rspMock;
- @Captor
- private ArgumentCaptor<Map<String, String>> captor;
+ @Mock private EventStore storeMock;
+ @Mock private QueryMaker queryMakerMock;
+ @Mock private Provider<CurrentUser> userProviderMock;
+ @Mock private CurrentUser userMock;
+ @Mock private HttpServletRequest reqMock;
+ @Mock private HttpServletResponse rspMock;
+ @Captor private ArgumentCaptor<Map<String, String>> captor;
private EventsRestApiServlet eventServlet;
@Before
public void setUp() {
- eventServlet =
- new EventsRestApiServlet(storeMock, queryMakerMock, userProviderMock);
+ eventServlet = new EventsRestApiServlet(storeMock, queryMakerMock, userProviderMock);
when(userProviderMock.get()).thenReturn(userMock);
when(userMock.isIdentifiedUser()).thenReturn(true);
@@ -73,22 +62,17 @@
@Test
public void queryStringSplitting() throws Exception {
when(reqMock.getQueryString()).thenReturn("a=1;b=2");
- when(queryMakerMock.formQueryFromRequestParameters(captor.capture()))
- .thenReturn(RANDOM_QUERY);
- when(storeMock.queryChangeEvents(RANDOM_QUERY))
- .thenReturn(new ArrayList<>());
+ when(queryMakerMock.formQueryFromRequestParameters(captor.capture())).thenReturn(RANDOM_QUERY);
+ when(storeMock.queryChangeEvents(RANDOM_QUERY)).thenReturn(new ArrayList<>());
eventServlet.doGet(reqMock, rspMock);
- assertThat(ImmutableMap.of("a", "1", "b", "2"))
- .isEqualTo(captor.getValue());
+ assertThat(ImmutableMap.of("a", "1", "b", "2")).isEqualTo(captor.getValue());
}
@Test
public void badQueryString() throws Exception {
when(reqMock.getQueryString()).thenReturn("a;b");
- when(queryMakerMock.formQueryFromRequestParameters(captor.capture()))
- .thenReturn(RANDOM_QUERY);
- when(storeMock.queryChangeEvents(RANDOM_QUERY))
- .thenReturn(new ArrayList<>());
+ when(queryMakerMock.formQueryFromRequestParameters(captor.capture())).thenReturn(RANDOM_QUERY);
+ when(storeMock.queryChangeEvents(RANDOM_QUERY)).thenReturn(new ArrayList<>());
eventServlet.doGet(reqMock, rspMock);
assertThat(captor.getValue()).isEmpty();
}
@@ -116,8 +100,7 @@
PrintWriter outMock = mock(PrintWriter.class);
List<String> listMock = ImmutableList.of("event one", "event two");
when(rspMock.getWriter()).thenReturn(outMock);
- when(queryMakerMock.formQueryFromRequestParameters(captor.capture()))
- .thenReturn(RANDOM_QUERY);
+ when(queryMakerMock.formQueryFromRequestParameters(captor.capture())).thenReturn(RANDOM_QUERY);
when(storeMock.queryChangeEvents(RANDOM_QUERY)).thenReturn(listMock);
eventServlet.doGet(reqMock, rspMock);
verify(outMock).write(listMock.get(0) + "\n");
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java
index 96d87a1..45a7426 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java
@@ -17,12 +17,10 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
-import com.google.common.collect.ImmutableMap;
-
import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
import com.ericsson.gerrit.plugins.eventslog.QueryMaker;
-
+import com.google.common.collect.ImmutableMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,8 +37,7 @@
private QueryMaker queryMaker;
private String defaultQuery;
- @Mock
- private EventsLogConfig cfgMock;
+ @Mock private EventsLogConfig cfgMock;
private String query;
@@ -53,60 +50,51 @@
@Test
public void returnDefaultQueryforNullMap() throws Exception {
- assertThat(queryMaker.formQueryFromRequestParameters(null))
- .isEqualTo(defaultQuery);
+ assertThat(queryMaker.formQueryFromRequestParameters(null)).isEqualTo(defaultQuery);
}
@Test(expected = MalformedQueryException.class)
public void badParameters() throws Exception {
- queryMaker.formQueryFromRequestParameters(
- ImmutableMap.of(T1, "13/13/32", T2, "14/10/10"));
+ queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T1, "13/13/32", T2, "14/10/10"));
}
@Test
public void dateOneOnly() throws Exception {
- query = queryMaker
- .formQueryFromRequestParameters(ImmutableMap.of(T1, OLD_DATE));
+ query = queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T1, OLD_DATE));
assertThat(query).contains(String.format("'%s' and ", OLD_DATE));
}
@Test
public void dateTwoOnly() throws Exception {
- query = queryMaker
- .formQueryFromRequestParameters(ImmutableMap.of(T2, OLD_DATE));
+ query = queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T2, OLD_DATE));
assertThat(query).contains(String.format("'%s' and ", OLD_DATE));
}
@Test(expected = MalformedQueryException.class)
public void noDate() throws Exception {
- queryMaker
- .formQueryFromRequestParameters(ImmutableMap.of());
+ queryMaker.formQueryFromRequestParameters(ImmutableMap.of());
}
@Test
public void dateOrdering() throws Exception {
- query = queryMaker.formQueryFromRequestParameters(
- ImmutableMap.of(T1, OLD_DATE, T2, NEW_DATE));
- assertThat(query)
- .contains(String.format("'%s' and '%s'", OLD_DATE, NEW_DATE));
+ query = queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T1, OLD_DATE, T2, NEW_DATE));
+ assertThat(query).contains(String.format("'%s' and '%s'", OLD_DATE, NEW_DATE));
- query = queryMaker.formQueryFromRequestParameters(
- ImmutableMap.of(T1, NEW_DATE, T2, OLD_DATE));
- assertThat(query)
- .contains(String.format("'%s' and '%s'", OLD_DATE, NEW_DATE));
+ query = queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T1, NEW_DATE, T2, OLD_DATE));
+ assertThat(query).contains(String.format("'%s' and '%s'", OLD_DATE, NEW_DATE));
}
@Test
public void bothDateTime() throws Exception {
- query = queryMaker.formQueryFromRequestParameters(
- ImmutableMap.of(T1, OLD_DATE, T2, NEW_DATE));
+ query = queryMaker.formQueryFromRequestParameters(ImmutableMap.of(T1, OLD_DATE, T2, NEW_DATE));
assertThat(query).isNotEqualTo(defaultQuery);
}
@Test
public void onlyDateNoTime() throws Exception {
- query = queryMaker.formQueryFromRequestParameters(
- ImmutableMap.of(T1, "2013-10-10", T2, "2014-10-10"));
+ query =
+ queryMaker.formQueryFromRequestParameters(
+ ImmutableMap.of(T1, "2013-10-10", T2, "2014-10-10"));
assertThat(query).isNotEqualTo(defaultQuery);
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
index c51dd3a..4d0fdc4 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
@@ -16,11 +16,10 @@
import static com.google.common.truth.Truth.assertThat;
-import org.junit.Before;
-import org.junit.Test;
-
import java.sql.Timestamp;
import java.util.Calendar;
+import org.junit.Before;
+import org.junit.Test;
public class SQLEntryTest {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
index b257d89..cd89fcd 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -24,6 +24,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
+import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
+import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.events.ProjectEvent;
@@ -31,11 +34,18 @@
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gson.Gson;
-
-import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
-import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
-import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
-
+import java.net.ConnectException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -47,39 +57,21 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.net.ConnectException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
@RunWith(MockitoJUnitRunner.class)
public class SQLStoreTest {
private static final Logger log = LoggerFactory.getLogger(SQLStoreTest.class);
private static final String TEST_URL = "jdbc:h2:mem:" + TABLE_NAME;
private static final String TEST_LOCAL_URL = "jdbc:h2:mem:test";
private static final String TEST_DRIVER = "org.h2.Driver";
- private static final String TEST_OPTIONS =
- "DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false";
+ private static final String TEST_OPTIONS = "DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false";
private static final String TERM_CONN_MSG = "terminating connection";
private static final String MSG = "message";
private static final String GENERIC_QUERY = "SELECT * FROM " + TABLE_NAME;
- @Mock
- private EventsLogConfig cfgMock;
- @Mock
- private PermissionBackend permissionBackendMock;
- @Mock
- private PermissionBackend.ForProject forProjectMock;
- @Mock
- private PermissionBackend.WithUser withUserMock;
+ @Mock private EventsLogConfig cfgMock;
+ @Mock private PermissionBackend permissionBackendMock;
+ @Mock private PermissionBackend.ForProject forProjectMock;
+ @Mock private PermissionBackend.WithUser withUserMock;
private SQLClient eventsDb;
private SQLClient localEventsDb;
@@ -88,13 +80,11 @@
private Statement stat;
private MockEvent mockEvent;
- @Rule
- public TemporaryFolder testFolder = new TemporaryFolder();
+ @Rule public TemporaryFolder testFolder = new TemporaryFolder();
@Before
public void setUp() throws SQLException {
- Connection conn =
- DriverManager.getConnection(TEST_URL + ";" + TEST_OPTIONS);
+ Connection conn = DriverManager.getConnection(TEST_URL + ";" + TEST_OPTIONS);
mockEvent = new MockEvent();
stat = conn.createStatement();
poolMock = new PoolMock();
@@ -111,8 +101,7 @@
@Test
public void storeThenQueryVisible() throws Exception {
when(permissionBackendMock.currentUser()).thenReturn(withUserMock);
- when(withUserMock.project(any(Project.NameKey.class)))
- .thenReturn(forProjectMock);
+ when(withUserMock.project(any(Project.NameKey.class))).thenReturn(forProjectMock);
doNothing().when(forProjectMock).check(ProjectPermission.ACCESS);
setUpClient();
store.storeEvent(mockEvent);
@@ -124,9 +113,9 @@
@Test
public void storeThenQueryNotVisible() throws Exception {
when(permissionBackendMock.currentUser()).thenReturn(withUserMock);
- when(withUserMock.project(any(Project.NameKey.class)))
- .thenReturn(forProjectMock);
- doThrow(new PermissionBackendException("")).when(forProjectMock)
+ when(withUserMock.project(any(Project.NameKey.class))).thenReturn(forProjectMock);
+ doThrow(new PermissionBackendException(""))
+ .when(forProjectMock)
.check(ProjectPermission.ACCESS);
setUpClient();
store.storeEvent(mockEvent);
@@ -144,9 +133,9 @@
@Test
public void notReturnEventWithNoVisibilityInfo() throws Exception {
when(permissionBackendMock.currentUser()).thenReturn(withUserMock);
- when(withUserMock.project(any(Project.NameKey.class)))
- .thenReturn(forProjectMock);
- doThrow(new PermissionBackendException("")).when(forProjectMock)
+ when(withUserMock.project(any(Project.NameKey.class))).thenReturn(forProjectMock);
+ doThrow(new PermissionBackendException(""))
+ .when(forProjectMock)
.check(ProjectPermission.ACCESS);
setUpClient();
store.storeEvent(mockEvent);
@@ -162,8 +151,7 @@
setUpClientMock();
doThrow(exceptions).doNothing().when(eventsDb).storeEvent(mockEvent);
doThrow(exceptions).doNothing().when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(eventsDb, times(3)).storeEvent(mockEvent);
@@ -178,8 +166,7 @@
setUpClientMock();
doThrow(exceptions).doNothing().when(eventsDb).storeEvent(mockEvent);
doThrow(exceptions).doNothing().when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(eventsDb, times(3)).storeEvent(mockEvent);
@@ -191,8 +178,7 @@
when(cfgMock.getMaxTries()).thenReturn(3);
setUpClientMock();
doThrow(new SQLException(MSG)).when(eventsDb).storeEvent(mockEvent);
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(eventsDb, times(1)).storeEvent(mockEvent);
@@ -206,8 +192,7 @@
setUpClientMock();
doThrow(exceptions).doNothing().when(eventsDb).storeEvent(mockEvent);
doThrow(exceptions).doNothing().when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(eventsDb, times(1)).storeEvent(mockEvent);
@@ -216,11 +201,9 @@
@Test(expected = ServiceUnavailableException.class)
public void throwSQLExceptionIfNotOnline() throws Exception {
setUpClientMock();
- doThrow(new SQLException(new ConnectException())).when(eventsDb)
- .createDBIfNotCreated();
+ doThrow(new SQLException(new ConnectException())).when(eventsDb).createDBIfNotCreated();
doThrow(new SQLException()).when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
store.queryChangeEvents(GENERIC_QUERY);
@@ -231,14 +214,12 @@
MockEvent mockEvent = new MockEvent();
MockEvent mockEvent2 = new MockEvent("proj");
when(permissionBackendMock.currentUser()).thenReturn(withUserMock);
- when(withUserMock.project(any(Project.NameKey.class)))
- .thenReturn(forProjectMock);
+ when(withUserMock.project(any(Project.NameKey.class))).thenReturn(forProjectMock);
doNothing().when(forProjectMock).check(ProjectPermission.ACCESS);
eventsDb = new SQLClient(TEST_DRIVER, TEST_URL, TEST_OPTIONS);
localEventsDb = new SQLClient(TEST_DRIVER, TEST_LOCAL_URL, TEST_OPTIONS);
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
localEventsDb.createDBIfNotCreated();
localEventsDb.storeEvent(mockEvent);
@@ -255,11 +236,9 @@
@Test
public void offlineUponStart() throws Exception {
setUpClientMock();
- doThrow(new SQLException(new ConnectException())).when(eventsDb)
- .createDBIfNotCreated();
+ doThrow(new SQLException(new ConnectException())).when(eventsDb).createDBIfNotCreated();
doThrow(new SQLException()).when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
verify(localEventsDb).createDBIfNotCreated();
}
@@ -267,11 +246,9 @@
@Test
public void storeLocalOffline() throws Exception {
setUpClientMock();
- doThrow(new SQLException(new ConnectException())).when(eventsDb)
- .createDBIfNotCreated();
+ doThrow(new SQLException(new ConnectException())).when(eventsDb).createDBIfNotCreated();
doThrow(new SQLException()).when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(localEventsDb).storeEvent(mockEvent);
@@ -281,11 +258,9 @@
public void storeLocalOfflineAfterNoRetry() throws Exception {
setUpClientMock();
when(cfgMock.getMaxTries()).thenReturn(0);
- doThrow(new SQLException(new ConnectException())).when(eventsDb)
- .createDBIfNotCreated();
+ doThrow(new SQLException(new ConnectException())).when(eventsDb).createDBIfNotCreated();
doThrow(new SQLException()).when(eventsDb).queryOne();
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
store.storeEvent(mockEvent);
verify(localEventsDb).storeEvent(mockEvent);
@@ -294,8 +269,7 @@
private void setUpClient() {
eventsDb = new SQLClient(TEST_DRIVER, TEST_URL, TEST_OPTIONS);
localEventsDb = new SQLClient(TEST_DRIVER, TEST_LOCAL_URL, TEST_OPTIONS);
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
}
@@ -306,23 +280,19 @@
}
/**
- * For this test we expect that if we can connect to main database, then we
- * should come back online and try setting up again. We just want to make sure
- * that restoreEventsFromLocal gets called, so verifying that getLocalDBFile
- * is called is sufficient.
+ * For this test we expect that if we can connect to main database, then we should come back
+ * online and try setting up again. We just want to make sure that restoreEventsFromLocal gets
+ * called, so verifying that getLocalDBFile is called is sufficient.
*/
@Test
public void testConnectionTask() throws Exception {
eventsDb = new SQLClient(TEST_DRIVER, TEST_URL, TEST_OPTIONS);
localEventsDb = mock(SQLClient.class);
when(localEventsDb.dbExists()).thenReturn(true);
- when(localEventsDb.getAll())
- .thenReturn(ImmutableList.of(mock(SQLEntry.class)));
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ when(localEventsDb.getAll()).thenReturn(ImmutableList.of(mock(SQLEntry.class)));
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
- poolMock.scheduleWithFixedDelay(store.new CheckConnectionTask(), 0, 0,
- TimeUnit.MILLISECONDS);
+ poolMock.scheduleWithFixedDelay(store.new CheckConnectionTask(), 0, 0, TimeUnit.MILLISECONDS);
verify(localEventsDb, times(2)).removeOldEvents(0);
}
@@ -341,19 +311,19 @@
localEventsDb = new SQLClient(TEST_DRIVER, TEST_LOCAL_URL, TEST_OPTIONS);
localEventsDb.createDBIfNotCreated();
localEventsDb.storeEvent(mockEvent);
- doThrow(new SQLException(new ConnectException())).doNothing().when(eventsDb)
+ doThrow(new SQLException(new ConnectException()))
+ .doNothing()
+ .when(eventsDb)
.createDBIfNotCreated();
if (copy) {
when(cfgMock.getCopyLocal()).thenReturn(true);
}
- store = new SQLStore(cfgMock, eventsDb,
- localEventsDb, poolMock, permissionBackendMock);
+ store = new SQLStore(cfgMock, eventsDb, localEventsDb, poolMock, permissionBackendMock);
store.start();
verify(eventsDb).queryOne();
- verify(eventsDb).storeEvent(any(String.class), any(Timestamp.class),
- any(String.class));
+ verify(eventsDb).storeEvent(any(String.class), any(Timestamp.class), any(String.class));
List<SQLEntry> entries = localEventsDb.getAll();
assertThat(entries).isEmpty();
}
@@ -382,8 +352,8 @@
}
@Override
- public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command,
- long initialDelay, long delay, TimeUnit unit) {
+ public ScheduledFuture<?> scheduleWithFixedDelay(
+ Runnable command, long initialDelay, long delay, TimeUnit unit) {
log.info(command.toString());
command.run();
return null;
