Fix javadoc error, add checkNotNull to FieldValue getters

mziccard · mziccard · commit 43eb31bf5188 · 2015-12-11T19:43:55.000+01:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -31,8 +31,8 @@
 
 /**
  * Google BigQuery Table Field Value class. Objects of this class represent values of a BigQuery
- * Table Field. A list of values forms a {@link TableRow}. Tables rows can be gotten as the result
- * of a query or when listing table data.
+ * Table Field. A list of values forms a table row. Tables rows can be gotten as the result of a
+ * query or when listing table data.
  */
 public class FieldValue implements Serializable {
 
@@ -99,7 +99,8 @@ public boolean isNull() {
   }
 
   /**
-   * Returns this field's value as an {@link Object}.
+   * Returns this field's value as a {@link Object}. If {@link #isNull()} is {@code true} this
+   * method returns {@code null}.
    */
   public Object value() {
     return value;
@@ -112,9 +113,11 @@ public Object value() {
    * {@link Field.Type#timestamp()}).
    *
    * @throws ClassCastException if the field is not a primitive type
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public String stringValue() {
+    checkNotNull(value);
     return (String) value;
   }
 
@@ -155,7 +158,6 @@ public double doubleValue() {
   @SuppressWarnings("unchecked")
   public boolean booleanValue() {
     String stringValue = stringValue();
-    checkNotNull(stringValue);
     checkState(stringValue.equalsIgnoreCase("true") || stringValue.equalsIgnoreCase("false"),
         "Field value is not of boolean type");
     return Boolean.parseBoolean(stringValue);
@@ -183,9 +185,11 @@ public long timestampValue() {
    * {@link Attribute#REPEATED}).
    *
    * @throws ClassCastException if the field has not {@link Field.Mode#REPEATED} mode
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public List<FieldValue> repeatedValue() {
+    checkNotNull(value);
     return (List<FieldValue>) value;
   }
 
@@ -195,9 +199,11 @@ public List<FieldValue> repeatedValue() {
    * is {@link Attribute#RECORD}).
    *
    * @throws ClassCastException if the field is not a {@link Field.Type#record(Field...)} type
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
    */
   @SuppressWarnings("unchecked")
   public List<FieldValue> recordValue() {
+    checkNotNull(value);
     return (List<FieldValue>) value;
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -50,8 +50,7 @@ public class InsertAllRequest implements Serializable {
    * A Google Big Query row to be inserted into a table. Each {@code RowToInsert} has an associated
    * id used by BigQuery to detect duplicate insertion requests on a best-effort basis.
    *
-   * <p>
-   * Example usage of creating a row to insert:
+   * <p>Example usage of creating a row to insert:
    * <pre>    {@code
    *   List<Long> repeatedFieldValue = Arrays.asList(1L, 2L);
    *   Map<String, Object> recordContent = new HashMap<String, Object>();
@@ -128,7 +127,6 @@ public static RowToInsert of(String id, Map<String, Object> content) {
     /**
      * Creates a row to be inserted without associated id.
      *
-     * @param id id of the row, used to identify duplicates
      * @param content the actual content of the row
      */
     public static RowToInsert of(Map<String, Object> content) {
@@ -176,8 +174,7 @@ public Builder addRow(RowToInsert rowToInsert) {
     /**
      * Adds a row to be inserted with associated id.
      *
-     * <p>
-     * Example usage of adding a row with associated id:
+     * <p>Example usage of adding a row with associated id:
      * <pre>    {@code
      *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List<Long> repeatedFieldValue = Arrays.asList(1L, 2L);
@@ -198,8 +195,7 @@ public Builder addRow(String id, Map<String, Object> content) {
     /**
      * Adds a row to be inserted without an associated id.
      *
-     * <p>
-     * Example usage of adding a row without an associated id:
+     * <p>Example usage of adding a row without an associated id:
      * <pre>    {@code
      *   InsertAllRequest.Builder builder = InsertAllRequest.builder(tableId);
      *   List<Long> repeatedFieldValue = Arrays.asList(1L, 2L);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
@@ -35,7 +35,7 @@
 /**
  * Google Cloud BigQuery insert all response. Objects of this class possibly contain errors for an
  * {@link InsertAllRequest}. If a row failed to be inserted, the non-empty list of errors associated
- * to that row's index can be obtained with {@link InsertAllResponse#errorsFor(Long)}.
+ * to that row's index can be obtained with {@link InsertAllResponse#errorsFor(long)}.
  * {@link InsertAllResponse#insertErrors()} can be used to return all errors caused by a
  * {@link InsertAllRequest} as a map.
  */
