Skip to content

Accept all java.time type values when pattern and type co-exist #5890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BalusC wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −11
Draft

Accept all java.time type values when pattern and type co-exist #5890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions impl/src/main/java/org/glassfish/mojarra/facelets/tag/faces/core/ConvertDateTimeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.glassfish.mojarra.facelets.tag.faces.core;

import java.util.Set;
import java.util.TimeZone;

import jakarta.el.ELException;
Expand Down Expand Up @@ -44,6 +45,14 @@
*/
public final class ConvertDateTimeHandler extends ConverterHandler {

/**
* The values of the {@code type} attribute which represent a {@code java.time} class, as listed in
* {@link DateTimeConverter#setType(String)}. Only for these may {@code pattern} and {@code type} co-exist.
*/
private static final Set<String> JAVA_TIME_TYPES = Set.of(
"localDate", "localDateTime", "localTime", "offsetTime", "offsetDateTime", "zonedDateTime",
"instant", "year", "yearMonth", "monthDay");

private final TagAttribute dateStyle;

private final TagAttribute locale;
Expand Down Expand Up @@ -94,7 +103,7 @@ public void setAttributes(FaceletContext ctx, Object obj) {
// for java.time values
if (type != null) {
String typeStr = type.getValue(ctx);
if (isJavaTimeType(typeStr)) {
if (JAVA_TIME_TYPES.contains(typeStr)) {
c.setType(typeStr);
}
}
Expand Down Expand Up @@ -127,16 +136,6 @@ public void setAttributes(FaceletContext ctx, Object obj) {
}
}

private static boolean isJavaTimeType(String type) {
boolean result = false;
if (null != type && type.length() > 1) {
char c = type.charAt(0);
result = c == 'l' || c == 'o' || c == 'z';
}

return result;
}

@Override
public MetaRuleset createMetaRuleset(Class<?> type) {
return super.createMetaRuleset(type).ignoreAll();
Expand Down
Loading