Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fix Sonar's "Generic exceptions should never be thrown"
Collapse "if" statements to reduce method complexity
Remove redundant parentheses
Remove redundant toString
Change-Id: Id241f6b145fb47cf5218c1ce14cc2b34bea3c1cc
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
index e4be69a..a8241cb 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
@@ -51,10 +51,12 @@
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
+import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.EnumSet;
import java.util.Objects;
+import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
@@ -199,7 +201,8 @@
return Integer.toString(n);
}
- private boolean createHAReplicaSite(FileBasedConfig pluginConfig) throws Exception {
+ private boolean createHAReplicaSite(FileBasedConfig pluginConfig)
+ throws ConfigInvalidException, IOException {
ui.header("HA replica site setup");
ui.message(
"It is possible to create a copy of the master site and configure both sites to run\n"
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 5ebd728..79f1583 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
@@ -54,7 +54,7 @@
try {
if (!MediaType.parse(req.getContentType()).is(JSON_UTF_8)) {
sendError(
- rsp, SC_UNSUPPORTED_MEDIA_TYPE, "Expecting " + JSON_UTF_8.toString() + " content type");
+ rsp, SC_UNSUPPORTED_MEDIA_TYPE, "Expecting " + JSON_UTF_8 + " content type");
return;
}
forwardedEventHandler.dispatch(getEventFromRequest(req));
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinder.java
index 0e1c6d5..4b86646 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinder.java
@@ -56,10 +56,7 @@
Optional<InetAddress> findFirstAppropriateAddress(List<NetworkInterface> networkInterfaces)
throws SocketException {
for (NetworkInterface ni : networkInterfaces) {
- if (ni.isLoopback() || !ni.isUp() || !ni.supportsMulticast()) {
- continue;
- }
- if (shouldSkip(ni.getName())) {
+ if (ni.isLoopback() || !ni.isUp() || !ni.supportsMulticast() || shouldSkip(ni.getName())) {
continue;
}
Enumeration<InetAddress> inetAddresses = ni.getInetAddresses();
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 f2e03ad..67ae744 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
@@ -265,7 +265,7 @@
String projectName = PROJECT_TO_ADD;
doThrow(new IOException())
.when(httpSessionMock)
- .post((buildProjectListCacheEndpoint(projectName)));
+ .post(buildProjectListCacheEndpoint(projectName));
assertThat(forwarder.addToProjectList(projectName)).isFalse();
}
