From 22bea1da0129b6cb065b0402cae4e27ab4dd3297 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Thu, 14 Jan 2016 15:37:30 +0100
Subject: [PATCH] Add sources and Javadoc to the build

---
 spring-web-reactive/build.gradle              | 24 +++++++++++++++++++
 .../core/codec/support/JsonObjectDecoder.java |  3 +--
 .../web/reactive/DispatcherHandler.java       |  6 ++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle
index 117cab0e2a2..dab2f0a7129 100644
--- a/spring-web-reactive/build.gradle
+++ b/spring-web-reactive/build.gradle
@@ -37,6 +37,27 @@ ext {
 	jettyVersion = '9.3.5.v20151012'
 }
 
+javadoc {
+	options.author = true
+	options.addStringOption('Xdoclint:none', '-quiet')
+	options.links 'http://docs.oracle.com/javase/8/docs/api/'
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+	classifier = 'sources'
+	from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+	classifier = 'javadoc'
+	from javadoc.destinationDir
+}
+
+artifacts {
+	archives sourcesJar
+	archives javadocJar
+}
+
 dependencies {
 	compile "org.springframework:spring-core:${springVersion}"
 	compile "org.springframework:spring-web:${springVersion}"
@@ -66,6 +87,9 @@ dependencies {
 		exclude group: 'org.hamcrest', module: 'hamcrest-core'
 	}
 	testCompile("org.hamcrest:hamcrest-all:1.3")
+
+	// Needed to run Javadoc without error
+	optional("org.apache.httpcomponents:httpclient:4.5.1")
 }
 
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java
index 59598d519eb..07ec097cd7f 100644
--- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java
+++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java
@@ -39,8 +39,7 @@ import org.springframework.util.MimeType;
  * is considered a JSON object/array if it contains a matching number of opening
  * and closing braces/brackets.
  *
- * Based on <a href=https://github.com/netty/netty/blob/master/codec/src/main/java/io/netty/handler/codec/json/JsonObjectDecoder.java">
- * Netty {@code JsonObjectDecoder}</a>
+ * Based on  <a href="https://github.com/netty/netty/blob/master/codec/src/main/java/io/netty/handler/codec/json/JsonObjectDecoder.java">Netty JsonObjectDecoder</a>
  *
  * @author Sebastien Deleuze
  * @see JsonObjectEncoder
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
index cb99099a719..3c4484a5baf 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
@@ -39,14 +39,14 @@ import org.springframework.web.server.WebServerExchange;
  * Central dispatcher for HTTP request handlers/controllers. Dispatches to registered
  * handlers for processing a web request, providing convenient mapping facilities.
  *
- * <li>It can use any {@link HandlerMapping} implementation to control the routing of
+ * <p>It can use any {@link HandlerMapping} implementation to control the routing of
  * requests to handler objects. HandlerMapping objects can be defined as beans in
  * the application context.
  *
- * <li>It can use any {@link HandlerAdapter}; this allows for using any handler interface.
+ * <p>It can use any {@link HandlerAdapter}; this allows for using any handler interface.
  * HandlerAdapter objects can be added as beans in the application context.
  *
- * <li>It can use any {@link HandlerResultHandler}; this allows to process the result of
+ * <p>It can use any {@link HandlerResultHandler}; this allows to process the result of
  * the request handling. HandlerResultHandler objects can be added as beans in the
  * application context.
  *