From 67e471686b0ca8e680ae3ac6054184580758eb4f Mon Sep 17 00:00:00 2001
From: Michael-A-McMahon <Michael.A.McMahon@oracle.com>
Date: Mon, 6 Nov 2023 10:58:52 -0800
Subject: [PATCH] Fixing JavaDocs

---
 .../java/oracle/r2dbc/OracleR2dbcOptions.java    | 16 ++++++++++------
 src/main/java/oracle/r2dbc/impl/Publishers.java  |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/oracle/r2dbc/OracleR2dbcOptions.java b/src/main/java/oracle/r2dbc/OracleR2dbcOptions.java
index 210b495..6b2fbe1 100644
--- a/src/main/java/oracle/r2dbc/OracleR2dbcOptions.java
+++ b/src/main/java/oracle/r2dbc/OracleR2dbcOptions.java
@@ -534,7 +534,7 @@ public static Set<Option<?>> options() {
    * </p><p>
    * This method can used when configuring an <code>Option</code> with values
    * from a <code>Supplier</code>:
-   * <pre>{@code
+   * </p><pre>{@code
    * void configurePassword(ConnectionFactoryOptions.Builder optionsBuilder) {
    *   optionsBuilder.option(supplied(PASSWORD), () -> getPassword());
    * }
@@ -542,12 +542,14 @@ public static Set<Option<?>> options() {
    * CharSequence getPassword() {
    *   // ... return a database password ...
    * }
-   * }</pre>
-   * </p><p>
+   * }</pre><p>
    * It is not strictly necessary to use this method when configuring an
    * <code>Option</code> with a value from a <code>Supplier</code>. This method
    * is offered for code readability and convenience.
    * </p>
+   * @param <T> The original value type of the option.
+   * @param option The option to cast.
+   * @return The option cast to have a Supplier value type.
    */
   public static <T> Option<Supplier<T>> supplied(Option<T> option) {
     @SuppressWarnings("unchecked")
@@ -565,7 +567,7 @@ public static <T> Option<Supplier<T>> supplied(Option<T> option) {
    * </p><p>
    * This method can used when configuring an <code>Option</code> with values
    * from a <code>Publisher</code>:
-   * <pre>{@code
+   * </p><pre>{@code
    * void configurePassword(ConnectionFactoryOptions.Builder optionsBuilder) {
    *   optionsBuilder.option(published(PASSWORD), getPasswordPublisher());
    * }
@@ -573,12 +575,14 @@ public static <T> Option<Supplier<T>> supplied(Option<T> option) {
    * Publisher<CharSequence> getPasswordPublisher() {
    *   // ... publish a database password ...
    * }
-   * }</pre>
-   * </p><p>
+   * }</pre><p>
    * It is not strictly necessary to use this method when configuring an
    * <code>Option</code> with a value from a <code>Publisher</code>. This method
    * is offered for code readability and convenience.
    * </p>
+   * @param <T> The original value type of the option.
+   * @param option The option to cast.
+   * @return The option cast to have a Publisher value type.
    */
   public static <T> Option<Publisher<T>> published(Option<T> option) {
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/oracle/r2dbc/impl/Publishers.java b/src/main/java/oracle/r2dbc/impl/Publishers.java
index d395ed2..590112c 100644
--- a/src/main/java/oracle/r2dbc/impl/Publishers.java
+++ b/src/main/java/oracle/r2dbc/impl/Publishers.java
@@ -53,11 +53,11 @@ private Publishers() {}
    *   publisher,
    *   onTerminationPublisher)
    *   .doOnCancel(onTerminationPublisher::subscribe)
-   * }</pre>
+   * }</pre><p>
    * However, the code above can result in:
-   * <pre>
+   * </p><pre>
    *   reactor.core.Exceptions$StaticThrowable: Operator has been terminated
-   * </pre>
+   * </pre><p>
    * This seems to happen when the concatDelayError publisher receives a cancel
    * from a downstream subscriber after it has already received onComplete from
    * a upstream publisher.