Skip to content

Commit

Permalink
Use ConcurrentSkipListSet in PrettyTime.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Isira-Seneviratne
Isira-Seneviratne committed Feb 21, 2023
1 parent 0f76709 commit b3eb48a
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 36 deletions.
57 changes: 26 additions & 31 deletions core/src/main/java/org/ocpsoft/prettytime/PrettyTime.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;

import org.ocpsoft.prettytime.impl.DurationImpl;
import org.ocpsoft.prettytime.impl.ResourcesTimeFormat;
Expand Down Expand Up @@ -72,9 +74,10 @@ public class PrettyTime
{
private volatile Instant reference;
private volatile Locale locale = Locale.getDefault();
private final Map<TimeUnit, TimeFormat> units = new ConcurrentHashMap<>();
private volatile List<TimeUnit> cachedUnits;
private String overrideResourceBundle;
private final Map<TimeUnit, TimeFormat> unitsAndFormats = new ConcurrentHashMap<>();
private final Set<TimeUnit> cachedUnits
= new ConcurrentSkipListSet<>(Comparator.comparingLong(TimeUnit::getMillisPerUnit));
private final String overrideResourceBundle;

/**
* Create a new {@link PrettyTime} instance that will always use the current value of
Expand Down Expand Up @@ -1306,12 +1309,12 @@ public String formatDurationUnrounded(final LocalDate then)
public TimeFormat getFormat(TimeUnit unit)
{
if (unit == null) return null;
if (units.get(unit) != null) {
return units.get(unit);
if (unitsAndFormats.get(unit) != null) {
return unitsAndFormats.get(unit);
} else {
// Trying to transform the TimeUnit to String does the trick
Map<String, TimeFormat> map = new ConcurrentHashMap<>();
units.keySet().forEach(key -> map.put(key.toString(), units.get(key)));
unitsAndFormats.keySet().forEach(key -> map.put(key.toString(), unitsAndFormats.get(key)));
return map.get(unit.toString());
}
}
Expand Down Expand Up @@ -1434,17 +1437,11 @@ public PrettyTime setReference(final LocalDate localDate, final ZoneId zoneId)
}

/**
* Get the unmodifiable {@link List} of the current configured {@link TimeUnit} instances in calculations.
* Get the unmodifiable {@link Set} of the current configured {@link TimeUnit} instances in calculations.
*/
public List<TimeUnit> getUnits()
public Set<TimeUnit> getUnits()
{
if (cachedUnits == null) {
List<TimeUnit> result = new ArrayList<>(units.keySet());
Collections.sort(result, Comparator.comparing(TimeUnit::getMillisPerUnit));
cachedUnits = Collections.unmodifiableList(result);
}

return cachedUnits;
return Collections.unmodifiableSet(cachedUnits);
}

/**
Expand All @@ -1456,7 +1453,7 @@ public <UNIT extends TimeUnit> UNIT getUnit(final Class<UNIT> unitType)
if (unitType == null)
return null;

for (TimeUnit unit : units.keySet()) {
for (TimeUnit unit : unitsAndFormats.keySet()) {
if (unitType.isAssignableFrom(unit.getClass())) {
return (UNIT) unit;
}
Expand All @@ -1471,10 +1468,9 @@ public <UNIT extends TimeUnit> UNIT getUnit(final Class<UNIT> unitType)
*/
public PrettyTime registerUnit(final TimeUnit unit, TimeFormat format)
{
cachedUnits = null;
cachedUnits.add(unit);
unitsAndFormats.put(unit, format);

units.put(Objects.requireNonNull(unit, "TimeUnit to register must not be null."),
Objects.requireNonNull(format, "TimeFormat to register must not be null."));
if (unit instanceof LocaleAware)
((LocaleAware<?>) unit).setLocale(locale);
if (format instanceof LocaleAware)
Expand Down Expand Up @@ -1520,11 +1516,11 @@ public <UNIT extends TimeUnit> TimeFormat removeUnit(final Class<UNIT> unitType)
if (unitType == null)
return null;

for (TimeUnit unit : units.keySet()) {
for (TimeUnit unit : unitsAndFormats.keySet()) {
if (unitType.isAssignableFrom(unit.getClass())) {
cachedUnits = null;
cachedUnits.remove(unit);

return units.remove(unit);
return unitsAndFormats.remove(unit);
}
}
return null;
Expand All @@ -1540,9 +1536,9 @@ public TimeFormat removeUnit(final TimeUnit unit)
if (unit == null)
return null;

cachedUnits = null;
cachedUnits.remove(unit);

return units.remove(unit);
return unitsAndFormats.remove(unit);
}

/**
Expand All @@ -1563,15 +1559,14 @@ public PrettyTime setLocale(Locale locale)
locale = Locale.getDefault();

this.locale = locale;
for (TimeUnit unit : units.keySet()) {
for (TimeUnit unit : unitsAndFormats.keySet()) {
if (unit instanceof LocaleAware)
((LocaleAware<?>) unit).setLocale(locale);
}
for (TimeFormat format : units.values()) {
for (TimeFormat format : unitsAndFormats.values()) {
if (format instanceof LocaleAware)
((LocaleAware<?>) format).setLocale(locale);
}
cachedUnits = null;
return this;
}

Expand All @@ -1586,9 +1581,9 @@ public String toString()
*/
public List<TimeUnit> clearUnits()
{
List<TimeUnit> result = getUnits();
cachedUnits = null;
units.clear();
List<TimeUnit> result = new ArrayList<>(cachedUnits);
cachedUnits.clear();
unitsAndFormats.clear();
return result;
}

Expand Down Expand Up @@ -1628,7 +1623,7 @@ private Duration calculateDuration(final long difference)
/*
* Required for thread-safety
*/
List<TimeUnit> localUnits = getUnits();
List<TimeUnit> localUnits = new ArrayList<>(getUnits());

DurationImpl result = new DurationImpl();

Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/ocpsoft/prettytime/PrettyTimeI18n_ET_Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -24,7 +25,7 @@ public void setUp() throws Exception
private PrettyTime newPrettyTimeWOJustNow(Date ref, Locale locale)
{
PrettyTime t = new PrettyTime(ref, locale);
List<TimeUnit> units = t.getUnits();
Set<TimeUnit> units = t.getUnits();
List<TimeFormat> formats = new ArrayList<TimeFormat>();
for (TimeUnit timeUnit : units) {
if (!(timeUnit instanceof JustNow)) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/ocpsoft/prettytime/PrettyTimeI18n_FI_Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -39,7 +40,7 @@ public void setUp() throws Exception
private PrettyTime newPrettyTimeWOJustNow(Date ref, Locale locale)
{
PrettyTime t = new PrettyTime(ref, locale);
List<TimeUnit> units = t.getUnits();
Set<TimeUnit> units = t.getUnits();
List<TimeFormat> formats = new ArrayList<TimeFormat>();
for (TimeUnit timeUnit : units) {
if (!(timeUnit instanceof JustNow)) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/ocpsoft/prettytime/PrettyTimeI18n_IT_Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -39,7 +40,7 @@ public void setUp() throws Exception
private PrettyTime newPrettyTimeWOJustNow(Date ref, Locale locale)
{
PrettyTime t = new PrettyTime(ref, locale);
List<TimeUnit> units = t.getUnits();
Set<TimeUnit> units = t.getUnits();
List<TimeFormat> formats = new ArrayList<TimeFormat>();
for (TimeUnit timeUnit : units) {
if (!(timeUnit instanceof JustNow)) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/ocpsoft/prettytime/PrettyTimeNoSignTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.junit.Assert;
import org.junit.Test;
Expand All @@ -20,7 +20,7 @@ public void testNoSuffixes() throws Exception
Date ref = format.parse("5/17/2009");
PrettyTime p = new PrettyTime(ref, Locale.ENGLISH);

List<TimeUnit> units = p.getUnits();
Set<TimeUnit> units = p.getUnits();
for (TimeUnit unit : units) {
TimeFormat fmt = p.getFormat(unit);
if (fmt instanceof SimpleTimeFormat)
Expand Down

0 comments on commit b3eb48a

Please sign in to comment.