From f6b93fa0305dacb1f40c88aca7c811016bf86ee0 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 2 Oct 2018 09:06:05 -0700
Subject: [PATCH] Fix Spanner javadoc errors

---
 .../main/java/com/google/cloud/spanner/DatabaseClient.java  | 6 ++++--
 .../src/main/java/com/google/cloud/spanner/ResultSet.java   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
index 969af0275fcf..372b0de3a6f2 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
@@ -288,9 +288,10 @@ public interface DatabaseClient {
    * statements, such as an OLTP workload, should prefer using {@link
    * TransactionContext#executeUpdate(Statement)} with {@link #readWriteTransaction()}.
    *
+   * <p>That said, Partitioned DML is not a drop-in replacement for standard DML used in {@link
+   * #readWriteTransaction()}.</p>
+   *
    * <ul>
-   *   That said, Partitioned DML is not a drop-in replacement for standard DML used in {@link
-   *   #readWriteTransaction()}.
    *   <li>The DML statement must be fully-partitionable. Specifically, the statement must be
    *       expressible as the union of many statements which each access only a single row of the
    *       table.
@@ -311,6 +312,7 @@ public interface DatabaseClient {
    *       due to schema constraints), then the operation is stopped at that point and an error is
    *       returned. It is possible that at this point, some partitions have been committed (or even
    *       committed multiple times), and other partitions have not been run at all.
+   * </ul>
    *
    * <p>Given the above, Partitioned DML is good fit for large, database-wide, operations that are
    * idempotent, such as deleting old rows from a very large table.
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
index 23ac2e50d267..5d396d8ec730 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.cloud.spanner.Options.QueryOption;
 import com.google.spanner.v1.ResultSetStats;
 import javax.annotation.Nullable;
 
@@ -65,7 +66,7 @@ public interface ResultSet extends AutoCloseable, StructReader {
    * Returns the {@link ResultSetStats} for the query only if the query was executed in either the
    * {@code PLAN} or the {@code PROFILE} mode via the {@link ReadContext#analyzeQuery(Statement,
    * com.google.cloud.spanner.ReadContext.QueryAnalyzeMode)} method or for DML statements in
-   * {@link ReadContext#executeQuery(Statement, QueryOption)}. Attempts to call this method on
+   * {@link ReadContext#executeQuery(Statement, QueryOption...)}. Attempts to call this method on
    * a {@code ResultSet} not obtained from {@code analyzeQuery} or {@code executeQuery} will return
    * a {@code null} {@code ResultSetStats}. This method must be called after {@link #next()} has
    * returned @{code false}. Calling it before that will result in {@code null}