From de7fb7a202172858d406deea93227fdbcddedc26 Mon Sep 17 00:00:00 2001 From: jianglai Date: Fri, 23 Sep 2016 12:38:58 -0700 Subject: [PATCH] Add type parameters to suppress Eclipse error message Eclipse (with Guide) is bothering me very much that it cannot infer the intended type for ImmutableList.of() from the argument type that the calling function defines. Adding explicit type parameters to get rid of the annoying exclamations marks in Eclipse. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=134105086 --- .../registry/rdap/RdapDomainSearchAction.java | 6 ++++- .../registry/rdap/RdapEntitySearchAction.java | 6 ++++- java/google/registry/rdap/RdapHelpAction.java | 2 +- .../registry/rdap/RdapJsonFormatter.java | 22 +++++++++++++++---- .../rdap/RdapNameserverSearchAction.java | 4 ++-- .../registry/rdap/RdapActionBaseTest.java | 4 ++-- .../registry/rdap/RdapJsonFormatterTest.java | 12 +++++----- 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java index 5cdad874a..d1abf4174 100644 --- a/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/java/google/registry/rdap/RdapDomainSearchAction.java @@ -126,7 +126,11 @@ public class RdapDomainSearchAction extends RdapActionBase { ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); builder.put("domainSearchResults", results); RdapJsonFormatter.addTopLevelEntries( - builder, BoilerplateType.DOMAIN, ImmutableList.of(), ImmutableList.of(), rdapLinkBase); + builder, + BoilerplateType.DOMAIN, + ImmutableList.>of(), + ImmutableList.>of(), + rdapLinkBase); return builder.build(); } diff --git a/java/google/registry/rdap/RdapEntitySearchAction.java b/java/google/registry/rdap/RdapEntitySearchAction.java index d53d76b62..12ccf97b7 100644 --- a/java/google/registry/rdap/RdapEntitySearchAction.java +++ b/java/google/registry/rdap/RdapEntitySearchAction.java @@ -101,7 +101,11 @@ public class RdapEntitySearchAction extends RdapActionBase { ImmutableMap.Builder jsonBuilder = new ImmutableMap.Builder<>(); jsonBuilder.put("entitySearchResults", results); RdapJsonFormatter.addTopLevelEntries( - jsonBuilder, BoilerplateType.ENTITY, ImmutableList.of(), ImmutableList.of(), rdapLinkBase); + jsonBuilder, + BoilerplateType.ENTITY, + ImmutableList.>of(), + ImmutableList.>of(), + rdapLinkBase); return jsonBuilder.build(); } diff --git a/java/google/registry/rdap/RdapHelpAction.java b/java/google/registry/rdap/RdapHelpAction.java index dbb0df80f..25e2c2250 100644 --- a/java/google/registry/rdap/RdapHelpAction.java +++ b/java/google/registry/rdap/RdapHelpAction.java @@ -137,7 +137,7 @@ public class RdapHelpAction extends RdapActionBase { builder, BoilerplateType.OTHER, ImmutableList.of(getJsonHelpNotice(pathSearchString, rdapLinkBase)), - ImmutableList.of(), + ImmutableList.>of(), rdapLinkBase); return builder.build(); } diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index e961618e1..aa1133141 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -507,7 +507,10 @@ public class RdapJsonFormatter { } if (isTopLevel) { addTopLevelEntries( - jsonBuilder, BoilerplateType.DOMAIN, remarks, ImmutableList.of(), linkBase); + jsonBuilder, + BoilerplateType.DOMAIN, + remarks, + ImmutableList.>of(), linkBase); } else if (!remarks.isEmpty()) { jsonBuilder.put(REMARKS, remarks); } @@ -586,7 +589,10 @@ public class RdapJsonFormatter { } if (isTopLevel) { addTopLevelEntries( - jsonBuilder, BoilerplateType.NAMESERVER, remarks, ImmutableList.of(), linkBase); + jsonBuilder, + BoilerplateType.NAMESERVER, + remarks, + ImmutableList.>of(), linkBase); } else if (!remarks.isEmpty()) { jsonBuilder.put(REMARKS, remarks); } @@ -672,7 +678,11 @@ public class RdapJsonFormatter { } if (isTopLevel) { addTopLevelEntries( - jsonBuilder, BoilerplateType.ENTITY, remarks, ImmutableList.of(), linkBase); + jsonBuilder, + BoilerplateType.ENTITY, + remarks, + ImmutableList.>of(), + linkBase); } else if (!remarks.isEmpty()) { jsonBuilder.put(REMARKS, remarks); } @@ -768,7 +778,11 @@ public class RdapJsonFormatter { } if (isTopLevel) { addTopLevelEntries( - jsonBuilder, BoilerplateType.ENTITY, remarks, ImmutableList.of(), linkBase); + jsonBuilder, + BoilerplateType.ENTITY, + remarks, + ImmutableList.>of(), + linkBase); } else if (!remarks.isEmpty()) { jsonBuilder.put(REMARKS, remarks); } diff --git a/java/google/registry/rdap/RdapNameserverSearchAction.java b/java/google/registry/rdap/RdapNameserverSearchAction.java index 0d6530098..f3da540f7 100644 --- a/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -106,8 +106,8 @@ public class RdapNameserverSearchAction extends RdapActionBase { RdapJsonFormatter.addTopLevelEntries( jsonBuilder, BoilerplateType.NAMESERVER, - ImmutableList.of(), - ImmutableList.of(), + ImmutableList.>of(), + ImmutableList.>of(), rdapLinkBase); return jsonBuilder.build(); } diff --git a/javatests/google/registry/rdap/RdapActionBaseTest.java b/javatests/google/registry/rdap/RdapActionBaseTest.java index 4ac607f6e..5a9508863 100644 --- a/javatests/google/registry/rdap/RdapActionBaseTest.java +++ b/javatests/google/registry/rdap/RdapActionBaseTest.java @@ -83,8 +83,8 @@ public class RdapActionBaseTest { RdapJsonFormatter.addTopLevelEntries( builder, BoilerplateType.OTHER, - ImmutableList.of(), - ImmutableList.of(), + ImmutableList.>of(), + ImmutableList.>of(), "http://myserver.google.com/"); return builder.build(); } diff --git a/javatests/google/registry/rdap/RdapJsonFormatterTest.java b/javatests/google/registry/rdap/RdapJsonFormatterTest.java index 7fa6f7629..88263d915 100644 --- a/javatests/google/registry/rdap/RdapJsonFormatterTest.java +++ b/javatests/google/registry/rdap/RdapJsonFormatterTest.java @@ -473,8 +473,8 @@ public class RdapJsonFormatterTest { RdapJsonFormatter.addTopLevelEntries( builder, RdapJsonFormatter.BoilerplateType.OTHER, - ImmutableList.of(), - ImmutableList.of(), + ImmutableList.>of(), + ImmutableList.>of(), LINK_BASE); assertThat(builder.build()).isEqualTo(loadJson("rdapjson_toplevel.json")); } @@ -487,7 +487,7 @@ public class RdapJsonFormatterTest { builder, RdapJsonFormatter.BoilerplateType.OTHER, ImmutableList.of(RdapHelpAction.getJsonHelpNotice("/tos", LINK_BASE)), - ImmutableList.of(), + ImmutableList.>of(), LINK_BASE); assertThat(builder.build()).isEqualTo(loadJson("rdapjson_toplevel.json")); } @@ -499,8 +499,8 @@ public class RdapJsonFormatterTest { RdapJsonFormatter.addTopLevelEntries( builder, RdapJsonFormatter.BoilerplateType.DOMAIN, - ImmutableList.of(), - ImmutableList.of(), + ImmutableList.>of(), + ImmutableList.>of(), LINK_BASE); assertThat(builder.build()).isEqualTo(loadJson("rdapjson_toplevel_domain.json")); } @@ -513,7 +513,7 @@ public class RdapJsonFormatterTest { builder, RdapJsonFormatter.BoilerplateType.DOMAIN, ImmutableList.of(RdapHelpAction.getJsonHelpNotice("/tos", LINK_BASE)), - ImmutableList.of(), + ImmutableList.>of(), LINK_BASE); assertThat(builder.build()).isEqualTo(loadJson("rdapjson_toplevel_domain.json")); }