Change Map<Str, Object> to Map<Str, ? extends Object> for BigQuery's RowToInsert (#1259)

jcanizales · mziccard · commit f50a31fbf57d · 2016-09-26T13:24:33.000+02:00
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java
@@ -76,7 +76,7 @@ public static class RowToInsert implements Serializable {
     private final String id;
     private final Map<String, Object> content;
 
-    RowToInsert(String id, Map<String, Object> content) {
+    RowToInsert(String id, Map<String, ?> content) {
       this.id = id;
       this.content = ImmutableMap.copyOf(content);
     }
@@ -125,7 +125,7 @@ public boolean equals(Object obj) {
      * @param id id of the row, used to identify duplicates
      * @param content the actual content of the row
      */
-    public static RowToInsert of(String id, Map<String, Object> content) {
+    public static RowToInsert of(String id, Map<String, ?> content) {
       return new RowToInsert(checkNotNull(id), checkNotNull(content));
     }
 
@@ -135,7 +135,7 @@ public static RowToInsert of(String id, Map<String, Object> content) {
      *
      * @param content the actual content of the row
      */
-    public static RowToInsert of(Map<String, Object> content) {
+    public static RowToInsert of(Map<String, ?> content) {
       return new RowToInsert(null, checkNotNull(content));
     }
   }
@@ -196,7 +196,7 @@ public Builder addRow(RowToInsert rowToInsert) {
      * builder.addRow("rowId", rowContent);
      * }</pre>
      */
-    public Builder addRow(String id, Map<String, Object> content) {
+    public Builder addRow(String id, Map<String, ?> content) {
       addRow(new RowToInsert(id, content));
       return this;
     }
@@ -219,7 +219,7 @@ public Builder addRow(String id, Map<String, Object> content) {
      * builder.addRow(rowContent);
      * }</pre>
      */
-    public Builder addRow(Map<String, Object> content) {
+    public Builder addRow(Map<String, ?> content) {
       addRow(new RowToInsert(null, content));
       return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static class RowToInsert implements Serializable {`
`76`	`76`	`private final String id;`
`77`	`77`	`private final Map<String, Object> content;`
`78`	`78`
`79`		`- RowToInsert(String id, Map<String, Object> content) {`
	`79`	`+ RowToInsert(String id, Map<String, ?> content) {`
`80`	`80`	`this.id = id;`
`81`	`81`	`this.content = ImmutableMap.copyOf(content);`
`82`	`82`	`}`
`@@ -125,7 +125,7 @@ public boolean equals(Object obj) {`
`125`	`125`	`* @param id id of the row, used to identify duplicates`
`126`	`126`	`* @param content the actual content of the row`
`127`	`127`	`*/`
`128`		`- public static RowToInsert of(String id, Map<String, Object> content) {`
	`128`	`+ public static RowToInsert of(String id, Map<String, ?> content) {`
`129`	`129`	`return new RowToInsert(checkNotNull(id), checkNotNull(content));`
`130`	`130`	`}`
`131`	`131`
`@@ -135,7 +135,7 @@ public static RowToInsert of(String id, Map<String, Object> content) {`
`135`	`135`	`*`
`136`	`136`	`* @param content the actual content of the row`
`137`	`137`	`*/`
`138`		`- public static RowToInsert of(Map<String, Object> content) {`
	`138`	`+ public static RowToInsert of(Map<String, ?> content) {`
`139`	`139`	`return new RowToInsert(null, checkNotNull(content));`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -196,7 +196,7 @@ public Builder addRow(RowToInsert rowToInsert) {`
`196`	`196`	`* builder.addRow("rowId", rowContent);`
`197`	`197`	`* }</pre>`
`198`	`198`	`*/`
`199`		`- public Builder addRow(String id, Map<String, Object> content) {`
	`199`	`+ public Builder addRow(String id, Map<String, ?> content) {`
`200`	`200`	`addRow(new RowToInsert(id, content));`
`201`	`201`	`return this;`
`202`	`202`	`}`
`@@ -219,7 +219,7 @@ public Builder addRow(String id, Map<String, Object> content) {`
`219`	`219`	`* builder.addRow(rowContent);`
`220`	`220`	`* }</pre>`
`221`	`221`	`*/`
`222`		`- public Builder addRow(Map<String, Object> content) {`
	`222`	`+ public Builder addRow(Map<String, ?> content) {`
`223`	`223`	`addRow(new RowToInsert(null, content));`
`224`	`224`	`return this;`
`225`	`225`	`}`