Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Remove use of Thread.sleep
Use logger built-in format
Change-Id: Id0c679494b7132fc6f21bc820817d0ed1c176802
diff --git a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfig.java b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfig.java
index 07f9c43..4031a4e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfig.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfig.java
@@ -52,7 +52,7 @@
private void load(File configPath) throws ConfigInvalidException, IOException {
FileBasedConfig cfg = new FileBasedConfig(configPath, FS.DETECTED);
if (!cfg.getFile().exists() || cfg.getFile().length() == 0) {
- logger.debug("No " + cfg.getFile() + " or empty; using all default values");
+ logger.debug("No {} or empty; using all default values", cfg.getFile());
return;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
index ff7f6b4..c665c7a 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
@@ -52,7 +52,7 @@
@Override
public void start() {
timer.schedule(new HeartbeatTask(), 0, config.getDelay());
- logger.info("Initialized to send heartbeat event every " + config.getDelay() + " milliseconds");
+ logger.info("Initialized to send heartbeat event every {} milliseconds", config.getDelay());
}
@Override
diff --git a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
index 3aec912..765daac 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemonTest.java
@@ -29,6 +29,7 @@
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.SchemaFactory;
import com.google.gwtorm.server.StandardKeyEncoder;
+import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
@@ -66,7 +67,7 @@
replay(eventDispatcherMock);
heartbeatDaemon.start();
- Thread.sleep(500);
+ TimeUnit.MILLISECONDS.sleep(500);
verify(eventDispatcherMock);
heartbeatDaemon.stop();
}
