Skip to content

Create jakarta compatible jar during build and add more convertible objects #274

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

Open
dstutz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Create jakarta compatible jar during build and add more convertible objects #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41c7779
Create jakarta compatible jar
Jul 18, 2024
f281627
Support more than just Date
Jul 18, 2024
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
76 changes: 56 additions & 20 deletions jsf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,62 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime-parent</artifactId>
<version>5.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime-parent</artifactId>
<version>5.0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>prettytime-integration-jsf</artifactId>
<artifactId>prettytime-integration-jsf</artifactId>

<name>PrettyTime - Integration - JSF</name>
<name>PrettyTime - Integration - JSF</name>

<dependencies>
<dependency>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime</artifactId>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime</artifactId>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>jakarta</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jakarta</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>javax.faces</pattern>
<shadedPattern>jakarta.faces</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
87 changes: 55 additions & 32 deletions jsf/src/main/java/org/ocpsoft/prettytime/jsf/PrettyTimeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright 2012 <a href="mailto:[email protected]">Lincoln Baxter, III</a>
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -15,58 +15,81 @@
*/
package org.ocpsoft.prettytime.jsf;


import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;

import org.ocpsoft.prettytime.Duration;
import org.ocpsoft.prettytime.PrettyTime;

import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;

public class PrettyTimeConverter implements Converter, Serializable
{
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;

public class PrettyTimeConverter implements Converter, Serializable {

private static final long serialVersionUID = 7690470362440868260L;

private static final int MAX_CACHE_SIZE = 20;

// Cache PrettyTime per locale. LRU cache to prevent memory leak.
private static final Map<Locale, PrettyTime> PRETTY_TIME_LOCALE_MAP = new LinkedHashMap<Locale, PrettyTime>(MAX_CACHE_SIZE + 1, 1.1F, true)
{
private static final long serialVersionUID = 5093634937930600141L;
private static final Map<Locale, PrettyTime> PRETTY_TIME_LOCALE_MAP = new LinkedHashMap<Locale, PrettyTime>(MAX_CACHE_SIZE + 1, 1.1F, true) {
private static final long serialVersionUID = 5093634937930600141L;

@Override
protected boolean removeEldestEntry(Map.Entry<Locale, PrettyTime> eldest)
{
@Override
protected boolean removeEldestEntry(Map.Entry<Locale, PrettyTime> eldest) {
return size() > MAX_CACHE_SIZE;
}
};


public Object getAsObject(final FacesContext context, final UIComponent comp, final String value)
{
public Object getAsObject(final FacesContext context, final UIComponent comp, final String value) {
throw new ConverterException("Does not yet support converting String to Date");
}

public String getAsString(final FacesContext context, final UIComponent comp, final Object value)
{
if (value instanceof Date)
{
// Use locale of current viewer.
Locale locale = context.getViewRoot().getLocale();
PrettyTime prettyTime;
public String getAsString(final FacesContext context, final UIComponent comp, final Object value) {
// Use locale of current viewer.
Locale locale = context.getViewRoot().getLocale();
PrettyTime prettyTime;

synchronized (PRETTY_TIME_LOCALE_MAP)
{
prettyTime = PRETTY_TIME_LOCALE_MAP.computeIfAbsent(locale, PrettyTime::new);
}
synchronized (PRETTY_TIME_LOCALE_MAP) {
prettyTime = PRETTY_TIME_LOCALE_MAP.computeIfAbsent(locale, PrettyTime::new);
}
if (value instanceof Date) {
return prettyTime.format((Date) value);
}
throw new ConverterException("May only be used to convert java.util.Date objects. Got: " + (value != null ? value.getClass() : "null"));
if (value instanceof Calendar) {
return prettyTime.format((Calendar) value);
}
if (value instanceof Duration) {
return prettyTime.format((Duration) value);
}
if (value instanceof Instant) {
return prettyTime.format((Instant) value);
}
if (value instanceof ZonedDateTime) {
return prettyTime.format((ZonedDateTime) value);
}
if (value instanceof OffsetDateTime) {
return prettyTime.format((OffsetDateTime) value);
}
if (value instanceof LocalDateTime) {
return prettyTime.format((LocalDateTime) value);
}
if (value instanceof LocalDate) {
return prettyTime.format((LocalDate) value);
}
throw new ConverterException("May only be used to convert java.util.Date,java.util.Calendar,"
+ "org.ocpsoft.prettytime.Duration,java.time.Instant,java.time.ZonedDateTime,"
+ "java.time.OffsetDateTime,java.time.LocalDateTime,java.time.LocalDate objects. "
+ "Got: " + (value != null ? value.getClass() : "null"));
}
}