Remove redundant type arguments

Change-Id: I29db788570c2d9080da80d38453de2e2b43cca87
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
index 7813dd0..e6c70c7 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandler.java
@@ -32,8 +32,7 @@
   private final Executor executor;
   private final Forwarder forwarder;
   private final String pluginName;
-  private final Set<IndexTask> queuedTasks =
-      Collections.newSetFromMap(new ConcurrentHashMap<IndexTask, Boolean>());
+  private final Set<IndexTask> queuedTasks = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
   @Inject
   IndexEventHandler(
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
index 2a4f9cc..07a61b0 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/HttpSessionTest.java
@@ -185,8 +185,7 @@
   @Test
   public void testNoRequestWhenPeerInfoUnknown() throws IOException {
     httpSession =
-        new HttpSession(
-            new HttpClientProvider(configMock).get(), Providers.of(Optional.<PeerInfo>empty()));
+        new HttpSession(new HttpClientProvider(configMock).get(), Providers.of(Optional.empty()));
     try {
       httpSession.post(ENDPOINT);
       fail("Expected PeerInfoNotAvailableException");
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinderTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinderTest.java
index 716819d..bfcffbb 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinderTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/peers/jgroups/InetAddressFinderTest.java
@@ -41,7 +41,7 @@
 
   @Test
   public void testNoSkipWhenEmptySkipList() {
-    when(configuration.jgroups().skipInterface()).thenReturn(ImmutableList.<String>of());
+    when(configuration.jgroups().skipInterface()).thenReturn(ImmutableList.of());
     assertThat(finder.shouldSkip("foo")).isFalse();
     assertThat(finder.shouldSkip("bar")).isFalse();
   }