You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/01/06 01:20:20 UTC

[sis] 07/07: More tolerant parsing of dates in the CSV reader. Javadoc update about default encoding (recent Java versions switch to UTF-8).

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 72613272caa30301bd350dcbb3e202a4839e386a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Jan 6 00:55:31 2022 +0100

    More tolerant parsing of dates in the CSV reader.
    Javadoc update about default encoding (recent Java versions switch to UTF-8).
---
 .../src/main/java/org/apache/sis/internal/storage/csv/Store.java  | 7 ++++---
 .../java/org/apache/sis/internal/storage/csv/TimeEncoding.java    | 4 ++--
 .../java/org/apache/sis/internal/storage/csv/package-info.java    | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
index a89e5fe..41a7841 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
@@ -52,6 +52,7 @@ import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.internal.referencing.GeodeticObjectBuilder;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
 import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.internal.util.StandardDateFormat;
 import org.apache.sis.internal.storage.MetadataBuilder;
 import org.apache.sis.internal.storage.io.IOUtilities;
 import org.apache.sis.internal.storage.io.RewindableLineReader;
@@ -87,7 +88,7 @@ import org.opengis.feature.AttributeType;
  * See package javadoc for more information on the syntax.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.2
  * @since   0.7
  * @module
  */
@@ -384,8 +385,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   = Instant.parse(element); continue;
-                    case 6: endTime     = Instant.parse(element); continue;
+                    case 5: startTime   = StandardDateFormat.parseInstantUTC(element); continue;
+                    case 6: endTime     = StandardDateFormat.parseInstantUTC(element); continue;
                     case 7: switch (element.toLowerCase(Locale.US)) {
                                 case "sec":
                                 case "second":   /* Already SECOND. */    continue;
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
index 66164b6..cb31c26 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
@@ -32,7 +32,7 @@ import org.apache.sis.measure.Units;
  * except in the special case of {@link #ABSOLUTE} encoding.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.2
  * @since   0.7
  * @module
  */
@@ -47,7 +47,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 Instant.parse(time);
+            return StandardDateFormat.parseInstantUTC(time);
         }
     };
 
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
index 07fdd10..3e75069 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
@@ -43,9 +43,9 @@
  * Departures are:
  *
  * <ul>
- *   <li>If the character encoding is not explicitly specified, then Apache SIS uses the platform default instead of UTF-8.
- *       If a file to read is known to be a Moving Features compliant file, the UTF-8 encoding should be associated to
- *       {@link org.apache.sis.setup.OptionKey#ENCODING} in the {@link org.apache.sis.storage.StorageConnector}.</li>
+ *   <li>Character encoding is not necessarily UTF-8 since a different encoding can be specified with
+ *       {@link org.apache.sis.setup.OptionKey#ENCODING} in the {@link org.apache.sis.storage.StorageConnector}.
+ *       If not specified, Apache SIS uses the Java platform default encoding (which is often UTF-8).</li>
  *   <li>The Apache SIS implementation does not replace the XML entities by the referenced characters.
  *       XML entities, if present, are included verbatim in the parsed text.</li>
  *   <li>The Apache SIS implementation does not replace the \\s, \\t, and \\b escape sequences by space, tab, and comma.
@@ -53,7 +53,7 @@
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.2
  * @since   0.7
  * @module
  */