Merge branch 'stable-2.14'
* stable-2.14:
Format all Java files using google-java-format
Change-Id: I958fbcb34b1e750633d510dafa2f26b79912109f
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 fb74e34..abe267f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -277,9 +277,7 @@
private JGroups(Config cfg) {
String[] skip = cfg.getStringList(JGROUPS_SECTION, null, SKIP_INTERFACE_KEY);
skipInterface = skip == null ? DEFAULT_SKIP_INTERFACE_LIST : ImmutableList.copyOf(skip);
- clusterName =
- getString(
- cfg, JGROUPS_SECTION, null, CLUSTER_NAME_KEY, DEFAULT_CLUSTER_NAME);
+ clusterName = getString(cfg, JGROUPS_SECTION, null, CLUSTER_NAME_KEY, DEFAULT_CLUSTER_NAME);
}
public ImmutableList<String> skipInterface() {
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 f3ff562..85dc137 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
@@ -160,8 +160,7 @@
initializeConfiguration();
assertThat(configuration.jgroups().clusterName()).isEqualTo(DEFAULT_CLUSTER_NAME);
- when(configMock.getString(JGROUPS_SECTION, null, CLUSTER_NAME_KEY))
- .thenReturn("foo");
+ when(configMock.getString(JGROUPS_SECTION, null, CLUSTER_NAME_KEY)).thenReturn("foo");
initializeConfiguration();
assertThat(configuration.jgroups().clusterName()).isEqualTo("foo");
}
@@ -171,15 +170,12 @@
when(configMock.getEnum(PEER_INFO_SECTION, null, STRATEGY_KEY, DEFAULT_PEER_INFO_STRATEGY))
.thenReturn(Configuration.PeerInfoStrategy.JGROUPS);
initializeConfiguration();
- assertThat(configuration.jgroups().skipInterface())
- .isEqualTo(DEFAULT_SKIP_INTERFACE_LIST);
+ assertThat(configuration.jgroups().skipInterface()).isEqualTo(DEFAULT_SKIP_INTERFACE_LIST);
when(configMock.getStringList(JGROUPS_SECTION, null, SKIP_INTERFACE_KEY))
.thenReturn(new String[] {"lo*", "eth0"});
initializeConfiguration();
- assertThat(configuration.jgroups().skipInterface())
- .containsAllOf("lo*", "eth0")
- .inOrder();
+ assertThat(configuration.jgroups().skipInterface()).containsAllOf("lo*", "eth0").inOrder();
}
@Test
