Document the JDK 9+ alternative to Maps#immutableEntry

Stephan202 · ronshapiro · commit 998858f9abd0 · 2019-02-26T13:53:50.000-05:00
Fixes #3385 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=234208826
diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java
@@ -1242,6 +1242,9 @@ public static ImmutableMap<String, String> fromProperties(Properties properties)
    *
    * <p>The returned entry is serializable.
    *
+   * <p><b>Java 9 users:</b> consider using {@code java.util.Map.entry(key, value)} if the key and
+   * value are non-null and the entry does not need to be serializable.
+   *
    * @param key the key to be associated with the returned entry
    * @param value the value to be associated with the returned entry
    */
diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java
@@ -1368,6 +1368,9 @@ public static ImmutableMap<String, String> fromProperties(Properties properties)
    *
    * <p>The returned entry is serializable.
    *
+   * <p><b>Java 9 users:</b> consider using {@code java.util.Map.entry(key, value)} if the key and
+   * value are non-null and the entry does not need to be serializable.
+   *
    * @param key the key to be associated with the returned entry
    * @param value the value to be associated with the returned entry
    */

Original file line number	Diff line number	Diff line change
`@@ -1242,6 +1242,9 @@ public static ImmutableMap<String, String> fromProperties(Properties properties)`
`1242`	`1242`	`*`
`1243`	`1243`	`* <p>The returned entry is serializable.`
`1244`	`1244`	`*`
	`1245`	`+ * <p><b>Java 9 users:</b> consider using {@code java.util.Map.entry(key, value)} if the key and`
	`1246`	`+ * value are non-null and the entry does not need to be serializable.`
	`1247`	`+ *`
`1245`	`1248`	`* @param key the key to be associated with the returned entry`
`1246`	`1249`	`* @param value the value to be associated with the returned entry`
`1247`	`1250`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1368,6 +1368,9 @@ public static ImmutableMap<String, String> fromProperties(Properties properties)`
`1368`	`1368`	`*`
`1369`	`1369`	`* <p>The returned entry is serializable.`
`1370`	`1370`	`*`
	`1371`	`+ * <p><b>Java 9 users:</b> consider using {@code java.util.Map.entry(key, value)} if the key and`
	`1372`	`+ * value are non-null and the entry does not need to be serializable.`
	`1373`	`+ *`
`1371`	`1374`	`* @param key the key to be associated with the returned entry`
`1372`	`1375`	`* @param value the value to be associated with the returned entry`
`1373`	`1376`	`*/`