Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Throw specific exceptions
Add private constructor to utility class
Change-Id: I8798b79c79c6182dc0427b390d9b84f3757ddf0e
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/SetupLocalHAReplica.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/SetupLocalHAReplica.java
index a58a8d7..ddbd994 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/SetupLocalHAReplica.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/SetupLocalHAReplica.java
@@ -39,6 +39,7 @@
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
@@ -58,7 +59,8 @@
this.sharedDir = masterSitePaths.site_path.resolve(DEFAULT_SHARED_DIRECTORY);
}
- void run(SitePaths replica, FileBasedConfig pluginConfig) throws Exception {
+ void run(SitePaths replica, FileBasedConfig pluginConfig)
+ throws IOException, ConfigInvalidException {
this.replicaSitePaths = replica;
FileUtil.mkdirsOrDie(replicaSitePaths.site_path, "cannot create " + replicaSitePaths.site_path);
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 120c615..b4c99b5 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
@@ -53,6 +53,10 @@
static class TimeMachine {
private static Clock clock = Clock.systemDefaultZone();
+ private TimeMachine() {
+ throw new IllegalAccessError("Utility class. Not meant to be instantiated.");
+ }
+
static Instant now() {
return Instant.now(getClock());
}
