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 6a7fb5526f2dfc6dbd272e624943bef348a5061f Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Mar 18 17:31:02 2025 +0100 Add missing converter declarations in `META-INF/services/` and minor formating. --- .../META-INF/services/org.apache.sis.util.ObjectConverter | 11 +++++++++++ .../main/org/apache/sis/converter/StringConverter.java | 2 +- .../main/org/apache/sis/storage/shapefile/dbf/DBFField.java | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter b/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter index 7d19bb3d96..2435a06537 100644 --- a/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter +++ b/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter @@ -10,6 +10,15 @@ org.apache.sis.converter.StringConverter$Float org.apache.sis.converter.StringConverter$Double org.apache.sis.converter.StringConverter$BigInteger org.apache.sis.converter.StringConverter$BigDecimal +org.apache.sis.converter.StringConverter$Instant +org.apache.sis.converter.StringConverter$ZonedDateTime +org.apache.sis.converter.StringConverter$OffsetDateTime +org.apache.sis.converter.StringConverter$LocalDateTime +org.apache.sis.converter.StringConverter$LocalDate +org.apache.sis.converter.StringConverter$LocalTime +org.apache.sis.converter.StringConverter$Year +org.apache.sis.converter.StringConverter$YearMonth +org.apache.sis.converter.StringConverter$MonthDay org.apache.sis.converter.StringConverter$Boolean org.apache.sis.converter.StringConverter$Locale org.apache.sis.converter.StringConverter$Charset @@ -37,6 +46,8 @@ org.apache.sis.converter.PathConverter$URI_URL org.apache.sis.converter.DateConverter$Long org.apache.sis.converter.DateConverter$SQL org.apache.sis.converter.DateConverter$Timestamp +org.apache.sis.converter.DateConverter$Instant +org.apache.sis.converter.InstantConverter$Date org.apache.sis.converter.CollectionConverter$List org.apache.sis.converter.CollectionConverter$Set org.apache.sis.converter.FractionConverter diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java index 98227e9dfc..6ca25ac0ab 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java @@ -21,9 +21,9 @@ import java.util.EnumSet; import java.util.IllformedLocaleException; import java.time.format.DateTimeParseException; import java.nio.charset.UnsupportedCharsetException; +import java.nio.file.InvalidPathException; import java.net.URISyntaxException; import java.net.MalformedURLException; -import java.nio.file.InvalidPathException; import javax.measure.format.MeasurementParseException; import org.apache.sis.math.FunctionProperty; import org.apache.sis.util.Locales; diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/dbf/DBFField.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/dbf/DBFField.java index 8df23402f3..a54797040f 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/dbf/DBFField.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/dbf/DBFField.java @@ -161,14 +161,14 @@ public final class DBFField { case TYPE_INC : valueClass = Object.class; reader = this::readAutoIncrement; writer = this::writeAutoIncrement; break; case TYPE_FLOAT : { valueClass = Double.class; - reader = this::readNumber; - writer = this::writeNumber; + reader = this::readNumber; + writer = this::writeNumber; format = NumberFormat.getNumberInstance(Locale.US); format.setGroupingUsed(false); format.setMaximumFractionDigits(fieldDecimals); format.setMinimumFractionDigits(fieldDecimals); break; - } + } case TYPE_DOUBLE : valueClass = Object.class; reader = this::readDouble; writer = this::writeDouble; break; case TYPE_OLE : valueClass = Object.class; reader = this::readOLE; writer = this::writeOLE; break; default: throw new IllegalArgumentException("Unknown field type " + fieldType);