This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 90c0f789d7daed6529635132759e1b1b7581a302
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Jun 13 16:14:11 2024 +0200
Rename `StandardDateFormat` as `LenientDateFormat`.
---
...ndardDateFormat.java => LenientDateFormat.java} | 14 +++----
...eFormatTest.java => LenientDateFormatTest.java} | 44 +++++++++++-----------
.../main/org/apache/sis/io/wkt/AbstractParser.java | 4 +-
.../main/org/apache/sis/io/wkt/Formatter.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../sis/storage/geotiff/reader/XMLMetadata.java | 6 +--
.../sis/storage/netcdf/classic/ChannelDecoder.java | 6 +--
.../sis/storage/netcdf/classic/VariableInfo.java | 4 +-
.../sis/storage/xml/stream/StaxStreamReader.java | 6 +--
.../main/org/apache/sis/storage/csv/Store.java | 6 +--
.../org/apache/sis/storage/csv/TimeEncoding.java | 4 +-
.../main/org/apache/sis/cql/CQL.java | 4 +-
.../org/apache/sis/cql/FilterToCQLVisitor.java | 6 +--
14 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/StandardDateFormat.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/StandardDateFormat.java
rename to
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
index ce58461976..5a63f41d66 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/StandardDateFormat.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/LenientDateFormat.java
@@ -64,7 +64,7 @@ import org.apache.sis.util.privy.Constants;
* @author Martin Desruisseaux (Geomatys)
*/
@SuppressWarnings("serial") // Not intended to be serialized.
-public final class StandardDateFormat extends DateFormat {
+public final class LenientDateFormat extends DateFormat {
/**
* Midnight (00:00) UTC.
*/
@@ -225,7 +225,7 @@ replace: if (Character.isWhitespace(c)) {
/**
* Creates a new format for a default locale in the UTC timezone.
*/
- public StandardDateFormat() {
+ public LenientDateFormat() {
formatWithoutZone = format = FORMAT;
}
@@ -234,7 +234,7 @@ replace: if (Character.isWhitespace(c)) {
*
* @param locale the locale of the format to create.
*/
- public StandardDateFormat(final Locale locale) {
+ public LenientDateFormat(final Locale locale) {
// Same instance as FORMAT if the locales are equal.
formatWithoutZone = format = FORMAT.withLocale(locale);
}
@@ -245,7 +245,7 @@ replace: if (Character.isWhitespace(c)) {
* @param locale the locale of the format to create.
* @param zone the timezone.
*/
- public StandardDateFormat(final Locale locale, final TimeZone zone) {
+ public LenientDateFormat(final Locale locale, final TimeZone zone) {
this(locale);
if (!Constants.UTC.equals(zone.getID())) {
setTimeZone(zone);
@@ -253,7 +253,7 @@ replace: if (Character.isWhitespace(c)) {
}
/**
- * Returns the calendar, creating it when first needed. This {@code
StandardDateFormat} class does not use the
+ * Returns the calendar, creating it when first needed. This {@code
LenientDateFormat} class does not use the
* calendar, but we nevertheless create it if requested in order to comply
with {@code DateFormat} contract.
*
* @return a calendar, created when first needed.
@@ -267,7 +267,7 @@ replace: if (Character.isWhitespace(c)) {
}
/**
- * Returns the number format, creating it when first needed. This {@code
StandardDateFormat} class does not use the
+ * Returns the number format, creating it when first needed. This {@code
LenientDateFormat} class does not use the
* number format, but we nevertheless create it if requested in order to
comply with {@code DateFormat} contract.
*
* @return a number format, created when first needed.
@@ -417,6 +417,6 @@ replace: if (Character.isWhitespace(c)) {
*/
@Override
public boolean equals(final Object obj) {
- return (obj instanceof StandardDateFormat) &&
format.equals(((StandardDateFormat) obj).format);
+ return (obj instanceof LenientDateFormat) &&
format.equals(((LenientDateFormat) obj).format);
}
}
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/StandardDateFormatTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/LenientDateFormatTest.java
similarity index 78%
rename from
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/StandardDateFormatTest.java
rename to
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/LenientDateFormatTest.java
index 01e4489973..492d98f7d2 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/StandardDateFormatTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/LenientDateFormatTest.java
@@ -30,19 +30,19 @@ import static org.apache.sis.test.TestUtilities.date;
/**
- * Tests the {@link StandardDateFormat} class.
+ * Tests the {@link LenientDateFormat} class.
*
* @author Martin Desruisseaux (Geomatys)
*/
-public final class StandardDateFormatTest extends TestCase {
+public final class LenientDateFormatTest extends TestCase {
/**
* Creates a new test case.
*/
- public StandardDateFormatTest() {
+ public LenientDateFormatTest() {
}
/**
- * Tests {@link StandardDateFormat#toISO(CharSequence, int, int)}.
+ * Tests {@link LenientDateFormat#toISO(CharSequence, int, int)}.
*/
@Test
public void testToISO() {
@@ -58,7 +58,7 @@ public final class StandardDateFormatTest extends TestCase {
* Helper method for {@link #testToISO()}.
*/
private static String toISO(final String text) {
- return StandardDateFormat.toISO(text, 0, text.length()).toString();
+ return LenientDateFormat.toISO(text, 0, text.length()).toString();
}
/**
@@ -69,7 +69,7 @@ public final class StandardDateFormatTest extends TestCase {
@Test
public void testParse() throws ParseException {
final long day = 1466985600000L;
- final StandardDateFormat f = new StandardDateFormat();
+ final LenientDateFormat f = new LenientDateFormat();
assertEquals(day + ((16*60 + 48)*60 )*1000,
f.parse("2016-06-27T16:48Z") .getTime());
assertEquals(day + ((16*60 + 48)*60 + 12)*1000,
f.parse("2016-06-27T16:48:12Z") .getTime());
assertEquals(day,
f.parse("2016-06-27") .getTime());
@@ -92,13 +92,13 @@ public final class StandardDateFormatTest extends TestCase {
@Test
public void testParseBest() {
final long day = 1466985600000L;
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
StandardDateFormat.parseBest("2016-06-27T16:48Z"));
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
StandardDateFormat.parseBest("2016-06-27T16:48:12Z"));
- assertEquals(Instant.ofEpochMilli(day + (( 3*60 + 2)*60 + 1)*1000 +
90), StandardDateFormat.parseBest("2016-06-27T03:02:01.09Z"));
- assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48, 12),
StandardDateFormat.parseBest("2016-06-27T16:48:12"));
- assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48),
StandardDateFormat.parseBest("2016-06-27T16:48"));
- assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48),
StandardDateFormat.parseBest("2016-06-27 16:48"));
- assertEquals(LocalDate.of(2016, 6, 27),
StandardDateFormat.parseBest("2016-06-27"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
LenientDateFormat.parseBest("2016-06-27T16:48Z"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
LenientDateFormat.parseBest("2016-06-27T16:48:12Z"));
+ assertEquals(Instant.ofEpochMilli(day + (( 3*60 + 2)*60 + 1)*1000 +
90), LenientDateFormat.parseBest("2016-06-27T03:02:01.09Z"));
+ assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48, 12),
LenientDateFormat.parseBest("2016-06-27T16:48:12"));
+ assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48),
LenientDateFormat.parseBest("2016-06-27T16:48"));
+ assertEquals(LocalDateTime.of(2016, 6, 27, 16, 48),
LenientDateFormat.parseBest("2016-06-27 16:48"));
+ assertEquals(LocalDate.of(2016, 6, 27),
LenientDateFormat.parseBest("2016-06-27"));
}
/**
@@ -107,14 +107,14 @@ public final class StandardDateFormatTest extends
TestCase {
@Test
public void testParseInstant() {
final long day = 1466985600000L;
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
StandardDateFormat.parseInstantUTC("2016-06-27T16:48Z"));
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
StandardDateFormat.parseInstantUTC("2016-06-27T16:48:12Z"));
- assertEquals(Instant.ofEpochMilli(day + (( 3*60 + 2)*60 + 1)*1000 +
90), StandardDateFormat.parseInstantUTC("2016-06-27T03:02:01.09Z"));
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
StandardDateFormat.parseInstantUTC("2016-06-27T16:48:12"));
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
StandardDateFormat.parseInstantUTC("2016-06-27T16:48"));
- assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
StandardDateFormat.parseInstantUTC("2016-06-27 16:48"));
- assertEquals(Instant.ofEpochMilli(day),
StandardDateFormat.parseInstantUTC("2016-06-27"));
- assertEquals(Instant.ofEpochMilli(day + 2000),
StandardDateFormat.parseInstantUTC("2016-06-27 00:00:02 UTC"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
LenientDateFormat.parseInstantUTC("2016-06-27T16:48Z"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
LenientDateFormat.parseInstantUTC("2016-06-27T16:48:12Z"));
+ assertEquals(Instant.ofEpochMilli(day + (( 3*60 + 2)*60 + 1)*1000 +
90), LenientDateFormat.parseInstantUTC("2016-06-27T03:02:01.09Z"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 + 12)*1000),
LenientDateFormat.parseInstantUTC("2016-06-27T16:48:12"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
LenientDateFormat.parseInstantUTC("2016-06-27T16:48"));
+ assertEquals(Instant.ofEpochMilli(day + ((16*60 + 48)*60 )*1000),
LenientDateFormat.parseInstantUTC("2016-06-27 16:48"));
+ assertEquals(Instant.ofEpochMilli(day),
LenientDateFormat.parseInstantUTC("2016-06-27"));
+ assertEquals(Instant.ofEpochMilli(day + 2000),
LenientDateFormat.parseInstantUTC("2016-06-27 00:00:02 UTC"));
}
/**
@@ -129,7 +129,7 @@ public final class StandardDateFormatTest extends TestCase {
public void testNegativeYear() throws ParseException {
final var julian = new Date(-210866760000000L); // Same epoch
as CommonCRS.Temporal.JULIAN.
final var expected = "-4713-11-24T12:00:00.000"; // Proleptic
Gregorian calendar, astronomical year.
- final var f = new StandardDateFormat();
+ final var f = new LenientDateFormat();
assertEquals(expected, f.format(julian));
assertEquals(julian, f.parse(expected));
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
index b4c8de9054..477011c6e0 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
@@ -37,7 +37,7 @@ import org.opengis.util.InternationalString;
import org.apache.sis.system.Loggers;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.measure.Units;
import org.apache.sis.measure.UnitFormat;
@@ -391,7 +391,7 @@ abstract class AbstractParser implements Parser {
*/
final Date parseDate(final String text, final ParsePosition position) {
if (dateFormat == null) {
- dateFormat = new StandardDateFormat(symbols.getLocale());
+ dateFormat = new LenientDateFormat(symbols.getLocale());
}
return dateFormat.parse(text, position);
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 4fa4993c0d..42e99bd399 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -73,7 +73,7 @@ import org.apache.sis.util.privy.X364;
import org.apache.sis.util.privy.Numerics;
import org.apache.sis.util.privy.Constants;
import org.apache.sis.temporal.TemporalDate;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.system.Configuration;
import org.apache.sis.metadata.simple.SimpleExtent;
import org.apache.sis.metadata.iso.extent.Extents;
@@ -372,7 +372,7 @@ public class Formatter implements Localized {
this.separatorNewLine = this.symbols.separatorNewLine();
this.indentation = (byte) indentation;
this.numberFormat = symbols.createNumberFormat();
- this.dateFormat = new StandardDateFormat(symbols.getLocale());
+ this.dateFormat = new LenientDateFormat(symbols.getLocale());
this.unitFormat = new UnitFormat(symbols.getLocale());
this.buffer = new StringBuffer();
unitFormat.setStyle(UnitFormat.Style.NAME);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
index e8cb817f10..d2ff6dda46 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
@@ -56,7 +56,7 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.privy.Constants;
import org.apache.sis.system.Loggers;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.referencing.ImmutableIdentifier;
import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
@@ -1145,7 +1145,7 @@ public class WKTFormat extends CompoundFormat<Object> {
return symbols.createNumberFormat();
}
if (valueType == Date.class) {
- return new StandardDateFormat(symbols.getLocale(), getTimeZone());
+ return new LenientDateFormat(symbols.getLocale(), getTimeZone());
}
final Format format = super.createFormat(valueType);
if (format instanceof UnitFormat) {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index 71296d4885..497646caba 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -94,7 +94,7 @@ import org.apache.sis.util.privy.Constants;
import org.apache.sis.util.privy.CollectionsExt;
import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.privy.URLs;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
@@ -1720,7 +1720,7 @@ codes: for (int i=0; i<codes.length; i++) {
throw new
FactoryDataException(resources().getString(Resources.Keys.DatumOriginShallBeDate));
}
try {
- originDate = StandardDateFormat.parseBest(anchor);
+ originDate = LenientDateFormat.parseBest(anchor);
} catch (RuntimeException e) {
throw new
FactoryDataException(resources().getString(Resources.Keys.DatumOriginShallBeDate),
e);
}
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java
index 9c34f8352d..7a5a64e482 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java
@@ -40,7 +40,7 @@ import javax.xml.transform.stax.StAXSource;
import javax.xml.namespace.QName;
import jakarta.xml.bind.JAXBException;
import org.apache.sis.io.stream.ChannelDataInput;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.storage.base.MetadataBuilder;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.storage.geotiff.base.Tags;
@@ -490,8 +490,8 @@ public final class XMLMetadata implements Filter {
final String content = buffer.toString();
if (!content.isEmpty()) {
switch (attribute) {
- case "acquisitionStartDate": startTime =
StandardDateFormat.parseInstantUTC(content); break;
- case "acquisitionEndDate": endTime =
StandardDateFormat.parseInstantUTC(content); break;
+ case "acquisitionStartDate": startTime =
LenientDateFormat.parseInstantUTC(content); break;
+ case "acquisitionEndDate": endTime =
LenientDateFormat.parseInstantUTC(content); break;
case "title": metadata.addTitle(content); break;
}
}
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
index 44f971a890..d0c20df6e4 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
@@ -62,7 +62,7 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.TableColumn;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.measure.Units;
@@ -863,7 +863,7 @@ public final class ChannelDecoder extends Decoder {
public Temporal dateValue(final String name) {
final Object value = findAttribute(name);
if (value instanceof CharSequence) try {
- return StandardDateFormat.parseBest((CharSequence) value);
+ return LenientDateFormat.parseBest((CharSequence) value);
} catch (RuntimeException e) {
listeners.warning(e);
}
@@ -883,7 +883,7 @@ public final class ChannelDecoder extends Decoder {
final Matcher parts = Variable.TIME_UNIT_PATTERN.matcher(symbol);
if (parts.matches()) try {
final UnitConverter converter =
Units.valueOf(parts.group(1)).getConverterToAny(Units.SECOND);
- final Instant epoch =
StandardDateFormat.parseInstantUTC(parts.group(2));
+ final Instant epoch =
LenientDateFormat.parseInstantUTC(parts.group(2));
for (int i=0; i<values.length; i++) {
final Number value = values[i];
if (value != null) {
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
index 3604d9344a..fffa87d900 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
@@ -54,7 +54,7 @@ import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.measure.Units;
import org.apache.sis.math.Vector;
@@ -426,7 +426,7 @@ final class VariableInfo extends Variable implements
Comparable<VariableInfo> {
* The parse method will replace the space between date and time
by 'T' letter.
*/
try {
- epoch = StandardDateFormat.parseInstantUTC(parts.group(2));
+ epoch = LenientDateFormat.parseInstantUTC(parts.group(2));
} catch (DateTimeParseException e) {
dateError = e;
}
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
index 998733e41d..d2e2074805 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
@@ -41,7 +41,7 @@ import jakarta.xml.bind.JAXBException;
import org.apache.sis.xml.bind.Context;
import org.apache.sis.util.privy.Strings;
import org.apache.sis.io.stream.IOUtilities;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.util.collection.BackingStoreException;
@@ -371,7 +371,7 @@ public abstract class StaxStreamReader extends StaxStreamIO
implements XMLStream
*/
protected final Date getElementAsDate() throws XMLStreamException {
final String text = getElementText();
- return (text == null) ? null :
Date.from(StandardDateFormat.parseInstantUTC(text));
+ return (text == null) ? null :
Date.from(LenientDateFormat.parseInstantUTC(text));
}
/**
@@ -383,7 +383,7 @@ public abstract class StaxStreamReader extends StaxStreamIO
implements XMLStream
* @throws DateTimeParseException if the text cannot be parsed as a date.
*/
protected final Temporal getElementAsTemporal() throws XMLStreamException {
- return StandardDateFormat.parseBest(getElementText());
+ return LenientDateFormat.parseBest(getElementText());
}
/**
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
index 89eca3c4cf..549224ca0e 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
@@ -52,7 +52,7 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.privy.Numerics;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.storage.DataOptionKey;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreContentException;
@@ -381,8 +381,8 @@ final class Store extends URIDataStore implements
FeatureSet {
ordinal++; // Fall through
case 3: lowerCorner = CharSequences.parseDoubles(element,
ORDINATE_SEPARATOR); continue;
case 4: upperCorner = CharSequences.parseDoubles(element,
ORDINATE_SEPARATOR); continue;
- case 5: startTime =
StandardDateFormat.parseInstantUTC(element); continue;
- case 6: endTime =
StandardDateFormat.parseInstantUTC(element); continue;
+ case 5: startTime =
LenientDateFormat.parseInstantUTC(element); continue;
+ case 6: endTime =
LenientDateFormat.parseInstantUTC(element); continue;
case 7: switch (element.toLowerCase(Locale.US)) {
case "sec":
case "second": /* Already SECOND. */
continue;
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
index b8ecf2b5f9..d48618192a 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
@@ -22,7 +22,7 @@ import javax.measure.Unit;
import javax.measure.quantity.Time;
import org.opengis.referencing.datum.TemporalDatum;
import org.apache.sis.converter.SurjectiveConverter;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.temporal.TemporalDate;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.measure.Units;
@@ -46,7 +46,7 @@ class TimeEncoding extends
SurjectiveConverter<String,Instant> {
*/
static final TimeEncoding ABSOLUTE = new TimeEncoding(DEFAULT.datum(),
Units.DAY) {
@Override public Instant apply(final String time) {
- return StandardDateFormat.parseInstantUTC(time);
+ return LenientDateFormat.parseInstantUTC(time);
}
};
diff --git a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
index c747caff37..64fe0c1e02 100644
--- a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
+++ b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/CQL.java
@@ -61,7 +61,7 @@ import
org.apache.sis.cql.internal.CQLParser.ExpressionUnaryContext;
import org.apache.sis.cql.internal.CQLParser.FilterContext;
import org.apache.sis.cql.internal.CQLParser.FilterGeometryContext;
import org.apache.sis.cql.internal.CQLParser.FilterTermContext;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
import static org.apache.sis.cql.internal.CQLParser.*;
@@ -284,7 +284,7 @@ public final class CQL {
case INT: return ff.literal(Integer.valueOf(tree.getText()));
case FLOAT: return ff.literal(Double.valueOf(tree.getText()));
case DATE: {
- TemporalAccessor ta =
StandardDateFormat.FORMAT.parse(tree.getText());
+ TemporalAccessor ta =
LenientDateFormat.FORMAT.parse(tree.getText());
return ff.literal(ta);
// TODO! return
ff.literal(TemporalUtilities.getTimeInMillis(tree.getText()));
}
diff --git
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
index aebf59b3cb..9dc909eff5 100644
---
a/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
+++
b/incubator/src/org.apache.sis.cql/main/org/apache/sis/cql/FilterToCQLVisitor.java
@@ -48,7 +48,7 @@ import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.filter.privy.FunctionNames;
import org.apache.sis.filter.privy.Visitor;
-import org.apache.sis.temporal.StandardDateFormat;
+import org.apache.sis.temporal.LenientDateFormat;
/**
@@ -174,10 +174,10 @@ final class FilterToCQLVisitor extends
Visitor<Feature,StringBuilder> {
sb.append(value);
} else if (value instanceof Date) {
final Date date = (Date) value;
- sb.append(StandardDateFormat.FORMAT.format(date.toInstant()));
+ sb.append(LenientDateFormat.FORMAT.format(date.toInstant()));
} else if (value instanceof TemporalAccessor) {
final TemporalAccessor date = (TemporalAccessor) value;
- sb.append(StandardDateFormat.FORMAT.format(date));
+ sb.append(LenientDateFormat.FORMAT.format(date));
} else if (value instanceof Geometry) {
final Geometry geometry = (Geometry) value;
final WKTWriter writer = new WKTWriter();
