Skip to content

Commit 8bfdc34

Browse files
Merge pull request #139 from oracle/javadoc-fix-1.2.0
Fixing JavaDocs
2 parents 571a88f + 67e4716 commit 8bfdc34

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/main/java/oracle/r2dbc/OracleR2dbcOptions.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -534,20 +534,22 @@ public static Set<Option<?>> options() {
534534
* </p><p>
535535
* This method can used when configuring an <code>Option</code> with values
536536
* from a <code>Supplier</code>:
537-
* <pre>{@code
537+
* </p><pre>{@code
538538
* void configurePassword(ConnectionFactoryOptions.Builder optionsBuilder) {
539539
* optionsBuilder.option(supplied(PASSWORD), () -> getPassword());
540540
* }
541541
*
542542
* CharSequence getPassword() {
543543
* // ... return a database password ...
544544
* }
545-
* }</pre>
546-
* </p><p>
545+
* }</pre><p>
547546
* It is not strictly necessary to use this method when configuring an
548547
* <code>Option</code> with a value from a <code>Supplier</code>. This method
549548
* is offered for code readability and convenience.
550549
* </p>
550+
* @param <T> The original value type of the option.
551+
* @param option The option to cast.
552+
* @return The option cast to have a Supplier value type.
551553
*/
552554
public static <T> Option<Supplier<T>> supplied(Option<T> option) {
553555
@SuppressWarnings("unchecked")
@@ -565,20 +567,22 @@ public static <T> Option<Supplier<T>> supplied(Option<T> option) {
565567
* </p><p>
566568
* This method can used when configuring an <code>Option</code> with values
567569
* from a <code>Publisher</code>:
568-
* <pre>{@code
570+
* </p><pre>{@code
569571
* void configurePassword(ConnectionFactoryOptions.Builder optionsBuilder) {
570572
* optionsBuilder.option(published(PASSWORD), getPasswordPublisher());
571573
* }
572574
*
573575
* Publisher<CharSequence> getPasswordPublisher() {
574576
* // ... publish a database password ...
575577
* }
576-
* }</pre>
577-
* </p><p>
578+
* }</pre><p>
578579
* It is not strictly necessary to use this method when configuring an
579580
* <code>Option</code> with a value from a <code>Publisher</code>. This method
580581
* is offered for code readability and convenience.
581582
* </p>
583+
* @param <T> The original value type of the option.
584+
* @param option The option to cast.
585+
* @return The option cast to have a Publisher value type.
582586
*/
583587
public static <T> Option<Publisher<T>> published(Option<T> option) {
584588
@SuppressWarnings("unchecked")

src/main/java/oracle/r2dbc/impl/Publishers.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ private Publishers() {}
5353
* publisher,
5454
* onTerminationPublisher)
5555
* .doOnCancel(onTerminationPublisher::subscribe)
56-
* }</pre>
56+
* }</pre><p>
5757
* However, the code above can result in:
58-
* <pre>
58+
* </p><pre>
5959
* reactor.core.Exceptions$StaticThrowable: Operator has been terminated
60-
* </pre>
60+
* </pre><p>
6161
* This seems to happen when the concatDelayError publisher receives a cancel
6262
* from a downstream subscriber after it has already received onComplete from
6363
* a upstream publisher.

0 commit comments

Comments
 (0)