1 files changed, 7 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
index aa91bf91c3..b8309e8022 100644
--- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
+++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
@@ -77,12 +77,11 @@ public class DataResourceXmlTest {
   @Before
   public void createCleanEnvironment() {
     fs = Jimfs.newFileSystem();
-    fqnFactory = FullyQualifiedName.Factory.from(ImmutableList.<String>of());
+    fqnFactory = FullyQualifiedName.Factory.from(ImmutableList.of());
   }
 
   private Path writeResourceXml(String... xml) throws IOException {
-    return writeResourceXml(ImmutableMap.<String, String>of(), ImmutableMap.<String, String>of(),
-        xml);
+    return writeResourceXml(ImmutableMap.of(), ImmutableMap.of(), xml);
   }
 
   private Path writeResourceXml(Map<String, String> namespaces, Map<String, String> attributes,
@@ -757,7 +756,7 @@ public class DataResourceXmlTest {
         .xmlContentsIsEqualTo(
             resourcesXmlFrom(
                 XLIFF_NAMESPACES,
-                ImmutableMap.<String, String>of(),
+                ImmutableMap.of(),
                 source,
                 "<string name=\"star_rating\">Check out our 5",
                 "    <xliff:g id=\"star\">\\u2605</xliff:g>",
@@ -792,7 +791,7 @@ public class DataResourceXmlTest {
         .xmlContentsIsEqualTo(
             resourcesXmlFrom(
                 ImmutableMap.of("ns1", "urn:oasis:names:tc:xliff:document:1.2"),
-                ImmutableMap.<String, String>of(),
+                ImmutableMap.of(),
                 source,
                 "<string name=\"star_rating\">Check out our 5    ",
                 "<ns1:g xmlns:foglebert=\"defogle\" " + "foglebert:id=\"star\">\\u2605</ns1:g>",
@@ -830,11 +829,10 @@ public class DataResourceXmlTest {
       "</string>"
     };
 
-    Path source = writeResourceXml(XLIFF_NAMESPACES, ImmutableMap.<String, String>of(), xml);
+    Path source = writeResourceXml(XLIFF_NAMESPACES, ImmutableMap.of(), xml);
     assertAbout(resourcePaths)
         .that(parsedAndWritten(source, fqn("string/AAP_SUGGEST_ACCEPT_SUGGESTION")))
-        .xmlContentsIsEqualTo(
-            resourcesXmlFrom(XLIFF_NAMESPACES, ImmutableMap.<String, String>of(), source, xml));
+        .xmlContentsIsEqualTo(resourcesXmlFrom(XLIFF_NAMESPACES, ImmutableMap.of(), source, xml));
   }
 
   @Test
@@ -1274,8 +1272,7 @@ public class DataResourceXmlTest {
   }
 
   private String[] resourcesXmlFrom(Path source, String... lines) {
-    return resourcesXmlFrom(ImmutableMap.<String, String>of(), ImmutableMap.<String, String>of(),
-        source, lines);
+    return resourcesXmlFrom(ImmutableMap.of(), ImmutableMap.of(), source, lines);
   }
 
   private String[] resourcesXmlFrom(Map<String, String> namespaces, Map<String, String> attributes,