From a234c528fe9d4a55699f6daf1a2c15c4f86f7baf Mon Sep 17 00:00:00 2001 From: "Thiago H. de Paula Figueiredo" Date: Tue, 1 Dec 2020 23:34:59 -0300 Subject: [PATCH] Fixing JavaDoc failures in Jenkins --- build.gradle | 4 +- .../commons/internal/BasicTypeCoercions.java | 2 +- src/javadoc/stylesheet7.css | 8 +++ .../java/org/apache/tapestry5/http/Link.java | 4 +- .../services/cron/CronExpression.java | 66 +++++++++---------- .../org/apache/tapestry5/json/JSONObject.java | 2 +- 6 files changed, 47 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index d7de534ae8..67034c23d9 100755 --- a/build.gradle +++ b/build.gradle @@ -148,8 +148,8 @@ subprojects { apply plugin: "project-report" apply plugin: "jacoco" - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + sourceCompatibility = "8" + targetCompatibility = "8" // See http://jira.codehaus.org/browse/GRADLE-784 diff --git a/commons/src/main/java/org/apache/tapestry5/commons/internal/BasicTypeCoercions.java b/commons/src/main/java/org/apache/tapestry5/commons/internal/BasicTypeCoercions.java index efb72a86dc..6e7b1d8ab6 100644 --- a/commons/src/main/java/org/apache/tapestry5/commons/internal/BasicTypeCoercions.java +++ b/commons/src/main/java/org/apache/tapestry5/commons/internal/BasicTypeCoercions.java @@ -37,7 +37,7 @@ public class BasicTypeCoercions { /** - * Provides the basic type coercions to a {@link Configuration} instance. + * Provides the basic type coercions to a {@link MappedConfiguration} instance. */ public static void provideBasicTypeCoercions( MappedConfiguration configuration) diff --git a/src/javadoc/stylesheet7.css b/src/javadoc/stylesheet7.css index cb04b365fe..ec0addce87 100644 --- a/src/javadoc/stylesheet7.css +++ b/src/javadoc/stylesheet7.css @@ -524,3 +524,11 @@ body > dt > b, li.blockList > dt > h3 { font-size: 14px; height: 26px; } + +.tt { + font-family: "Lucida Console", "Menlo", "Monaco", "Courier", monospace; +} + +.align-left { + text-align: left; +} \ No newline at end of file diff --git a/tapestry-http/src/main/java/org/apache/tapestry5/http/Link.java b/tapestry-http/src/main/java/org/apache/tapestry5/http/Link.java index bbf8651ba9..c572e50c45 100644 --- a/tapestry-http/src/main/java/org/apache/tapestry5/http/Link.java +++ b/tapestry-http/src/main/java/org/apache/tapestry5/http/Link.java @@ -39,7 +39,7 @@ public interface Link List getParameterNames(); /** - * Returns the value of a specifically named query parameter, or null if no such query parameter is stored + * Returns the value of a specifically named query parameter, or null if no such query parameter is stored * in the link. * * Use this method only when you are sure the parameter has only one value. If the parameter might have more than @@ -116,7 +116,7 @@ public interface Link String toRedirectURI(); /** - * Returns the link anchor. If this link does not have an anchor, this method returns null. + * Returns the link anchor. If this link does not have an anchor, this method returns null. * * @return the link anchor */ diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java index 372f48c0d4..5b79e56788 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java @@ -25,54 +25,54 @@ * Cron expressions are comprised of 6 required fields and one optional field * separated by white space. The fields respectively are described as follows: * - * + *
* - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * - * - * - * - * + * + * + * + * * * *
Field Name Allowed ValuesAllowed Special CharactersField Name Allowed ValuesAllowed Special Characters
Seconds 0-59, - * /Seconds 0-59, - * /
Minutes 0-59, - * /Minutes 0-59, - * /
Hours 0-23, - * /Hours 0-23, - * /
Day-of-month 1-31, - * ? / L WDay-of-month 1-31, - * ? / L W
Month 1-12 or JAN-DEC, - * /Month 1-12 or JAN-DEC, - * /
Day-of-Week 1-7 or SUN-SAT, - * ? / L #Day-of-Week 1-7 or SUN-SAT, - * ? / L #
Year (Optional) empty, 1970-2199, - * /Year (Optional) empty, 1970-2199, - * /
Cron Expressions
diff --git a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java index e6f9f47cf6..724cab725e 100644 --- a/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java +++ b/tapestry-json/src/main/java/org/apache/tapestry5/json/JSONObject.java @@ -47,7 +47,7 @@ * be coerced using {@link Number#intValue() intValue}. Strings * that can be coerced using {@link Double#valueOf(String)} will be, * and then cast to int. - *
  • When the requested type is a long, other {@link Number} types will + *
  • When the requested type is a long, other {@link Number} types will * be coerced using {@link Number#longValue() longValue}. Strings * that can be coerced using {@link Double#valueOf(String)} will be, * and then cast to long. This two-step conversion is lossy for very