- * A handler for <parseInstant> that supports rtexprvalue-based attributes. + * A handler for <parseInstant> that supports rtexprvalue-based + * attributes. *

Provides locale-neutral access to string resources. Only the - * documentation and code are in English. :-) + *

+ * Provides locale-neutral access to string resources. Only the documentation + * and code are in English. :-) * - *

The major goal, aside from globalization, is convenience. - * Access to resources with no parameters is made in the form:

+ * The major goal, aside from globalization, is convenience. Access to resources + * with no parameters is made in the form: + *

+ * *

- *     Resources.getMessage(MESSAGE_NAME);
+ * Resources.getMessage(MESSAGE_NAME);
  *

Access to resources with one parameter works like

+ * Access to resources with one parameter works like + *

+ * *

- *     Resources.getMessage(MESSAGE_NAME, arg1);
+ * Resources.getMessage(MESSAGE_NAME, arg1);
  *

... and so on.

+ * ... and so on. + *

* If no match was found in the previous step, check if a match exists between - * the fallback locale (given by the - * {@link Config#FMT_FALLBACK_LOCALE} configuration setting) and - * the available locales, for the given base name. + * the fallback locale (given by the {@link Config#FMT_FALLBACK_LOCALE} + * configuration setting) and the available locales, for the given base name. * * @param pc Page in which the resource bundle with the given base name is * requested @@ -432,7 +438,7 @@ public static LocalizationContext getLocalizationContext(PageContext pc) { * base name and the locale that led to the resource bundle match, or * the empty localization context if no resource bundle match was found */ - public static LocalizationContext getLocalizationContext(PageContext pc, String basename) { + public static LocalizationContext getLocalizationContext(final PageContext pc, final String basename) { LocalizationContext locCtxt = null; ResourceBundle bundle; @@ -503,13 +509,13 @@ public static LocalizationContext getLocalizationContext(PageContext pc, String * given base name and best matching locale, or {@code null} if no * resource bundle match was found */ - private static LocalizationContext findMatch(PageContext pageContext, String basename) { + private static LocalizationContext findMatch(final PageContext pageContext, final String basename) { LocalizationContext locCtxt = null; // Determine locale from client's browser settings. - for (Enumeration enum_ = Util.getRequestLocales((HttpServletRequest) pageContext.getRequest()); enum_ + for (Enumeration enum_ = Util.getRequestLocales((HttpServletRequest) pageContext.getRequest()); enum_ .hasMoreElements();) { - Locale pref = (Locale) enum_.nextElement(); + Locale pref = enum_.nextElement(); ResourceBundle match = findMatch(basename, pref); if (match != null) { locCtxt = new LocalizationContext(match, pref); @@ -535,7 +541,7 @@ private static LocalizationContext findMatch(PageContext pageContext, String bas * language-match between the preferred locale and the locale of the * bundle returned by java.util.ResourceBundle.getBundle(). */ - private static ResourceBundle findMatch(String basename, Locale pref) { + private static ResourceBundle findMatch(final String basename, final Locale pref) { ResourceBundle match = null; try { @@ -594,7 +600,7 @@ private static ResourceBundle findMatch(String basename, Locale pref) { * @throws JspException if the style is invalid * @return a formatter for the specified style */ - public static DateTimeFormatter createFormatterForStyle(String style) throws JspException { + public static DateTimeFormatter createFormatterForStyle(final String style) throws JspException { if (style == null || style.length() != 2) { throw new JspException("Invalid style specification: " + style); } @@ -613,16 +619,17 @@ public static DateTimeFormatter createFormatterForStyle(String style) throws Jsp * @param timeStyle the time style * @return the formatter */ - private static DateTimeFormatter createFormatterForStyleIndex(FormatStyle dateStyle, FormatStyle timeStyle) - throws JspException { - if (dateStyle == null && timeStyle == null) + private static DateTimeFormatter createFormatterForStyleIndex(final FormatStyle dateStyle, + final FormatStyle timeStyle) throws JspException { + if (dateStyle == null && timeStyle == null) { throw new JspException("Both styles cannot be null."); - else if (dateStyle != null && timeStyle != null) + } else if (dateStyle != null && timeStyle != null) { return DateTimeFormatter.ofLocalizedDateTime(dateStyle, timeStyle); - else if (dateStyle == null) + } else if (dateStyle == null) { return DateTimeFormatter.ofLocalizedTime(timeStyle); - else + } else { return DateTimeFormatter.ofLocalizedDate(dateStyle); + } } /** @@ -631,7 +638,7 @@ else if (dateStyle == null) * @param ch the one character style code * @return the FormatStyle */ - private static FormatStyle selectStyle(char ch) throws JspException { + private static FormatStyle selectStyle(final char ch) throws JspException { switch (ch) { case 'S': return SHORT; diff --git a/src/main/java/net/sargue/time/jsptags/ZoneIdSupport.java b/src/main/java/net/sargue/time/jsptags/ZoneIdSupport.java index b5712d1..2bac5e5 100644 --- a/src/main/java/net/sargue/time/jsptags/ZoneIdSupport.java +++ b/src/main/java/net/sargue/time/jsptags/ZoneIdSupport.java @@ -36,102 +36,109 @@ */ public abstract class ZoneIdSupport extends BodyTagSupport { - /** The config key for the time zone. */ - public static final String FMT_TIME_ZONE = "net.sargue.time.zoneId"; - - /** The value attribute. */ - protected Object value; - - /** The zone. */ - private ZoneId zoneId; - - /** - * Constructor. - */ - public ZoneIdSupport() { - super(); - init(); - } - - private void init() { - value = null; - } - - public ZoneId getZoneId() { - return zoneId; - } - - public int doStartTag() throws JspException { - if (value == null) { - zoneId = ZoneOffset.UTC; - } else if (value instanceof String) { - try { - zoneId = ZoneId.of((String) value); - } catch (IllegalArgumentException iae) { - zoneId = ZoneOffset.UTC; - } - } else { - zoneId = (ZoneId) value; - } - return EVAL_BODY_BUFFERED; - } - - public int doEndTag() throws JspException { - try { - pageContext.getOut().print(bodyContent.getString()); - } catch (IOException ioe) { - throw new JspTagException(ioe.toString(), ioe); - } - return EVAL_PAGE; - } - - // Releases any resources we may have (or inherit) - public void release() { - init(); - } - - /** - * Determines and returns the time zone to be used by the given action. - *

- * If the given action is nested inside a <zoneId> action, - * the time zone is taken from the enclosing <zoneId> action. - *

- * Otherwise, the time zone configuration setting - * net.sargue.time.jsptags.ZoneIdSupport.FMT_TIME_ZONE is used. - * - * @param pc the page containing the action for which the time zone - * needs to be determined - * @param fromTag the action for which the time zone needs to be determined - * - * @return the time zone, or null if the given action is not - * nested inside a <zoneId> action and no time zone configuration - * setting exists - */ - static ZoneId getZoneId(PageContext pc, Tag fromTag) { - ZoneId tz = null; - - Tag t = findAncestorWithClass(fromTag, ZoneIdSupport.class); - if (t != null) { - // use time zone from parent tag - ZoneIdSupport parent = (ZoneIdSupport) t; - tz = parent.getZoneId(); - } else { - // get time zone from configuration setting - Object obj = Config.find(pc, FMT_TIME_ZONE); - if (obj != null) { - if (obj instanceof ZoneId) { - tz = (ZoneId) obj; - } else { - try { - tz = ZoneId.of((String) obj); - } catch (IllegalArgumentException iae) { - tz = ZoneOffset.UTC; - } - } - } - } - - return tz; - } + private static final long serialVersionUID = 1L; + + /** The config key for the time zone. */ + public static final String FMT_TIME_ZONE = "net.sargue.time.zoneId"; + + /** The value attribute. */ + protected Object value; + + /** The zone. */ + private ZoneId zoneId; + + /** + * Constructor. + */ + public ZoneIdSupport() { + super(); + init(); + } + + private void init() { + value = null; + } + + /** + * + * @return the zone + */ + public ZoneId getZoneId() { + return zoneId; + } + + public int doStartTag() throws JspException { + if (value == null) { + zoneId = ZoneOffset.UTC; + } else if (value instanceof String) { + try { + zoneId = ZoneId.of((String) value); + } catch (IllegalArgumentException iae) { + zoneId = ZoneOffset.UTC; + } + } else { + zoneId = (ZoneId) value; + } + return EVAL_BODY_BUFFERED; + } + + public int doEndTag() throws JspException { + try { + pageContext.getOut().print(bodyContent.getString()); + } catch (IOException ioe) { + throw new JspTagException(ioe.toString(), ioe); + } + return EVAL_PAGE; + } + + @Override + public void release() { + init(); + super.release(); + } + + /** + * Determines and returns the time zone to be used by the given action. + *

+ * If the given action is nested inside a <zoneId> action, the time zone + * is taken from the enclosing <zoneId> action. + *

+ * Otherwise, the time zone configuration setting + * net.sargue.time.jsptags.ZoneIdSupport.FMT_TIME_ZONE is used. + * + * @param pc the page containing the action for which the time zone needs + * to be determined + * @param fromTag the action for which the time zone needs to be determined + * + * @return the time zone, or null if the given action is not nested + * inside a <zoneId> action and no time zone configuration setting + * exists + */ + static ZoneId getZoneId(final PageContext pc, final Tag fromTag) { + ZoneId tz = null; + + final Tag t = findAncestorWithClass(fromTag, ZoneIdSupport.class); + if (t != null) { + // use time zone from parent tag + final ZoneIdSupport parent = (ZoneIdSupport) t; + tz = parent.getZoneId(); + } else { + // get time zone from configuration setting + final Object obj = Config.find(pc, FMT_TIME_ZONE); + if (obj != null) { + if (obj instanceof ZoneId) { + tz = (ZoneId) obj; + } else { + try { + tz = ZoneId.of((String) obj); + } catch (IllegalArgumentException iae) { + tz = ZoneOffset.UTC; + } + } + } + } + + return tz; + } } diff --git a/src/main/java/net/sargue/time/jsptags/ZoneIdTag.java b/src/main/java/net/sargue/time/jsptags/ZoneIdTag.java index 03e8404..96ebb12 100644 --- a/src/main/java/net/sargue/time/jsptags/ZoneIdTag.java +++ b/src/main/java/net/sargue/time/jsptags/ZoneIdTag.java @@ -16,8 +16,6 @@ */ package net.sargue.time.jsptags; -import jakarta.servlet.jsp.JspTagException; - /** * A handler for <zoneId>. * @@ -26,9 +24,13 @@ */ public class ZoneIdTag extends ZoneIdSupport { - // for tag attribute - public void setValue(Object value) throws JspTagException { - this.value = value; - } + private static final long serialVersionUID = 1L; + + /** + * @param value for tag attribute + */ + public void setValue(final Object value) { + this.value = value; + } } diff --git a/src/test/java/net/sargue/time/jsptags/FormatTagTest.java b/src/test/java/net/sargue/time/jsptags/FormatTagTest.java index 81aca49..28f46f3 100644 --- a/src/test/java/net/sargue/time/jsptags/FormatTagTest.java +++ b/src/test/java/net/sargue/time/jsptags/FormatTagTest.java @@ -18,7 +18,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalUnit; import java.time.temporal.WeekFields; import java.util.Locale; import java.util.TimeZone; From 224701aa7a58d5492b1fe960f84279e623d8b2b0 Mon Sep 17 00:00:00 2001 From: Jon Schewe Date: Tue, 8 Feb 2022 20:01:50 -0600 Subject: [PATCH 14/21] Remove IDE files --- .gitignore | 1 + .project | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .project diff --git a/.gitignore b/.gitignore index 5a959fb..efb840a 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ crashlytics-build.properties # eclipse bin/ .classpath +.project \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 5ca4635..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - java-time-jsptags - - - - org.eclipse.jdt.core.javanature - - - - org.eclipse.jdt.core.javabuilder - - - - - - From df014ec8537a8f4bcacc911ff459b5be11a754ba Mon Sep 17 00:00:00 2001 From: Jon Schewe Date: Tue, 8 Feb 2022 20:11:30 -0600 Subject: [PATCH 15/21] Remove eclipse integration This also removes the reference to ben-manes.versions. --- build.gradle | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/build.gradle b/build.gradle index 9a1ee59..759adae 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ plugins { id "com.jfrog.bintray" version "1.7.3" id "java" - id "eclipse" - id "com.github.ben-manes.versions" version "0.41.0" // adds dependencyUpdates task id "maven-publish" } @@ -110,15 +108,3 @@ bintray { } } } - -eclipse { - classpath { - file { - // remove entries added due to issue with testsets - // https://github.com/unbroken-dome/gradle-testsets-plugin/issues/77 - whenMerged { - entries.removeAll{it.kind == "lib" && (it.path.endsWith("build/classes/java/test") || it.path.endsWith("build/resources/test"))} - } - } - } -} \ No newline at end of file From 101a91358b63a330e00fb8b3beab923246f20d5b Mon Sep 17 00:00:00 2001 From: Jon Schewe Date: Fri, 18 Feb 2022 19:09:08 -0600 Subject: [PATCH 16/21] Revert formatting changes --- .../sargue/time/jsptags/FormatSupport.java | 45 +- .../net/sargue/time/jsptags/FormatTag.java | 19 +- .../jsptags/JavaTimeTagLibraryValidator.java | 519 ++++--- .../sargue/time/jsptags/ParseInstantTag.java | 3 +- .../time/jsptags/ParseLocalDateTimeTag.java | 1 + .../time/jsptags/ParseLocalTimeTag.java | 1 + .../net/sargue/time/jsptags/ParseSupport.java | 417 +++--- .../net/sargue/time/jsptags/Resources.java | 275 ++-- .../sargue/time/jsptags/SetZoneIdIdTag.java | 2 +- .../sargue/time/jsptags/SetZoneIdSupport.java | 17 +- .../java/net/sargue/time/jsptags/Util.java | 1242 +++++++++-------- .../sargue/time/jsptags/ZoneIdSupport.java | 209 ++- .../net/sargue/time/jsptags/ZoneIdTag.java | 6 +- .../time/jsptags => }/FormatTagTest.java | 30 +- .../jsptags => }/ParseLocalDateTagTest.java | 12 +- 15 files changed, 1392 insertions(+), 1406 deletions(-) rename src/test/java/{net/sargue/time/jsptags => }/FormatTagTest.java (95%) rename src/test/java/{net/sargue/time/jsptags => }/ParseLocalDateTagTest.java (93%) diff --git a/src/main/java/net/sargue/time/jsptags/FormatSupport.java b/src/main/java/net/sargue/time/jsptags/FormatSupport.java index a543e40..e9a7c21 100644 --- a/src/main/java/net/sargue/time/jsptags/FormatSupport.java +++ b/src/main/java/net/sargue/time/jsptags/FormatSupport.java @@ -18,12 +18,7 @@ import java.io.IOException; import java.text.DateFormat; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.OffsetDateTime; -import java.time.OffsetTime; -import java.time.ZoneId; +import java.time.*; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; import java.util.Locale; @@ -34,8 +29,8 @@ import jakarta.servlet.jsp.tagext.TagSupport; /** - * Support for tag handlers for <formatDate>, the date and time formatting - * tag in JSTL 1.0. + * Support for tag handlers for <formatDate>, the date and time + * formatting tag in JSTL 1.0. * * @author Jan Luehe * @author Jim Newsham @@ -78,20 +73,13 @@ private void init() { scope = PageContext.PAGE_SCOPE; } - /** - * - * @param var the variable to store the result in - */ - public void setVar(final String var) { + @SuppressWarnings("UnusedDeclaration") + public void setVar(String var) { this.var = var; } - /** - * - * @param scope the scope to put the variable in - * @see #setVar(String) - */ - public void setScope(final String scope) { + @SuppressWarnings("UnusedDeclaration") + public void setScope(String scope) { this.scope = Util.getScope(scope); } @@ -120,7 +108,8 @@ public int doEndTag() throws JspException { // set formatter locale Locale locale = this.locale; if (locale == null) { - locale = Util.getFormattingLocale(pageContext, true, DateFormat.getAvailableLocales()); + locale = Util.getFormattingLocale(pageContext, true, + DateFormat.getAvailableLocales()); } if (locale != null) { formatter = formatter.withLocale(locale); @@ -134,8 +123,11 @@ public int doEndTag() throws JspException { if (zoneId != null) { formatter = formatter.withZone(zoneId); } else { - if (value instanceof Instant || value instanceof LocalDateTime || value instanceof OffsetDateTime - || value instanceof OffsetTime || value instanceof LocalTime) + if (value instanceof Instant || + value instanceof LocalDateTime || + value instanceof OffsetDateTime || + value instanceof OffsetTime || + value instanceof LocalTime) // these time objects may need a zone to resolve some patterns // and/or styles, and as there is no zone we revert to the // system default zone @@ -143,12 +135,13 @@ public int doEndTag() throws JspException { } // format value - String formatted = null; + String formatted; if (value instanceof TemporalAccessor) { formatted = formatter.format((TemporalAccessor) value); } else { - throw new JspException("value attribute of format tag must be a TemporalAccessor," + " was: " - + value.getClass().getName()); + throw new JspException( + "value attribute of format tag must be a TemporalAccessor," + + " was: " + value.getClass().getName()); } if (var != null) { @@ -164,7 +157,7 @@ public int doEndTag() throws JspException { return EVAL_PAGE; } - @Override + // Releases any resources we may have (or inherit) public void release() { init(); super.release(); diff --git a/src/main/java/net/sargue/time/jsptags/FormatTag.java b/src/main/java/net/sargue/time/jsptags/FormatTag.java index f1e4fd3..7b83a74 100644 --- a/src/main/java/net/sargue/time/jsptags/FormatTag.java +++ b/src/main/java/net/sargue/time/jsptags/FormatTag.java @@ -16,11 +16,11 @@ */ package net.sargue.time.jsptags; +import jakarta.servlet.jsp.JspTagException; + import java.time.ZoneId; import java.util.Locale; -import jakarta.servlet.jsp.JspTagException; - /** *

* A handler for <format> that supports rtexprvalue-based attributes. @@ -30,7 +30,8 @@ * @author Jim Newsham * @author Sergi Baila */ -public class FormatTag extends FormatSupport { + @SuppressWarnings("UnusedDeclaration") + public class FormatTag extends FormatSupport { private static final long serialVersionUID = 1L; @@ -39,7 +40,7 @@ public class FormatTag extends FormatSupport { * * @param value the value */ - public void setValue(final Object value) { + public void setValue(Object value) { this.value = value; } @@ -48,7 +49,7 @@ public void setValue(final Object value) { * * @param style the style */ - public void setStyle(final String style) { + public void setStyle(String style) { this.style = style; } @@ -57,7 +58,7 @@ public void setStyle(final String style) { * * @param pattern the pattern */ - public void setPattern(final String pattern) { + public void setPattern(String pattern) { this.pattern = pattern; } @@ -67,7 +68,7 @@ public void setPattern(final String pattern) { * @param dtz the zone * @throws JspTagException incorrect zone or dtz parameter */ - public void setZoneId(final Object dtz) throws JspTagException { + public void setZoneId(Object dtz) throws JspTagException { if (dtz == null || (dtz instanceof String && ((String) dtz).isEmpty())) { this.zoneId = null; } else if (dtz instanceof ZoneId) { @@ -75,7 +76,7 @@ public void setZoneId(final Object dtz) throws JspTagException { } else if (dtz instanceof String) { try { this.zoneId = ZoneId.of((String) dtz); - } catch (final IllegalArgumentException iae) { + } catch (IllegalArgumentException iae) { throw new JspTagException("Incorrect Zone: " + dtz); } } else @@ -88,7 +89,7 @@ public void setZoneId(final Object dtz) throws JspTagException { * @param loc the locale * @throws JspTagException parameter not a Locale or String */ - public void setLocale(final Object loc) throws JspTagException { + public void setLocale(Object loc) throws JspTagException { if (loc == null) { this.locale = null; } else if (loc instanceof Locale) { diff --git a/src/main/java/net/sargue/time/jsptags/JavaTimeTagLibraryValidator.java b/src/main/java/net/sargue/time/jsptags/JavaTimeTagLibraryValidator.java index 149cc39..314ff2e 100644 --- a/src/main/java/net/sargue/time/jsptags/JavaTimeTagLibraryValidator.java +++ b/src/main/java/net/sargue/time/jsptags/JavaTimeTagLibraryValidator.java @@ -16,14 +16,6 @@ */ package net.sargue.time.jsptags; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -31,11 +23,16 @@ import jakarta.servlet.jsp.tagext.PageData; import jakarta.servlet.jsp.tagext.TagLibraryValidator; import jakarta.servlet.jsp.tagext.ValidationMessage; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.IOException; +import java.util.*; /** *

- * A SAX-based TagLibraryValidator for the java.time tags. Currently implements - * the following checks: + * A SAX-based TagLibraryValidator for the java.time tags. Currently implements the + * following checks: *

- * A handler for <parseInstant> that supports rtexprvalue-based - * attributes. + * A handler for <parseInstant> that supports rtexprvalue-based attributes. *

- * Provides locale-neutral access to string resources. Only the documentation - * and code are in English. :-) + * Provides locale-neutral access to string resources. Only the + * documentation and code are in English. :-) * - *

- * The major goal, aside from globalization, is convenience. Access to resources - * with no parameters is made in the form: - *

The major goal, aside from globalization, is convenience. + * Access to resources with no parameters is made in the form:

  * Resources.getMessage(MESSAGE_NAME);
  *

- * Access to resources with one parameter works like - *

Access to resources with one parameter works like

  * Resources.getMessage(MESSAGE_NAME, arg1);
  *

- * ... and so on. - *