This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
from bc9edad990 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge is only about imports order. add 2be4a304df Change the program managing import order: - Put test dependencies in a separated section. - Do not put anymore "import static" in separated section, because it is a source of confusion with other sections. add 210f3ff99c fix(Shapefile): fix integer overflow on large dbf files add 6b91e57ba7 `PropertyValue.getXPath()` shall reformat the property name to XPath using "Q{namespace}" syntax when necessary. Conversely, `FeatureQuery` needs to convert XPath to property name. add 48e238f9ba Make a GeoTIFF writer test tolerance to the case where the EPSG database is absent. Better error messages. add 54a78ecf62 fix(Shapefile): replace skipBytes by seek, more efficient and avoids a loop add 57c14cd312 fix(Shapefile): fix combining multiple subset add e0588cac36 Minor cleaning (documentation, removal of a deprecated method). add c25766bdff Move `getEnvelope()` default implementation from `AbstractGridCoverageResource` class to `GridCoverageResource` interface. add ca8241da59 Add a `GridGeometry` constructor doing the concatenation of two grid geometries. Opportunistic migration of JUnit 4 to JUnit 5 for the relevant tests. add 8ba711cc91 Add a `GridCoverageProcessor.appendDimension(…)` method. add e4515b0eb1 Better anticipation of methods and constants to be available in future Java versions. add 242b57a25f Add convenience method for adding a vertical and temporal dimensions to a grid coverage. add 2b6989782e Add in `CoverageAggregator` the same convenience methods than the ones added in `GridCoverageProcessor` in previous commit. The intend is to make easier to append a vertical or temporal dimension to two-dimensional coverages to aggregate in a cube. add 7b9bdae224 In `appendDimension(...)` methods; restrict the CRS type to SingleCRS since it must be one-dimensional. add d747d8924b feat(Shapefile): implement ResourceOnFileSystem add f97dcee389 Miscellaneous utilities: - CommonCRS.Temporal.TROPICAL_YEAR - QuantityFormat.parseNumber(…) - IOUtilities.toBuffered(Reader) add e92eacbe6d Fix a ClassCastException when no resource is using deferred loading. add 6d1043d683 When opening files in a folder, inherit the options specified in the parent `StorageConnector`. add 2ef86ebf35 Move the `buildSrc` source code to its traditional location. The "Module Source Hierarchy" has no effect for this sub-project since it contains a single module. The intend is to make easier to add conventions in the way described by Gradle documentation. add af3440719f Create a "sis.library-conventions" with some common configuration for Gradle build. new e55d695764 Merge branch 'geoapi-4.0' into geoapi-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: buildSrc/build.gradle.kts | 24 +- .../org/apache/sis/buildtools/book/Assembler.java | 0 .../apache/sis/buildtools/book/BookException.java | 0 .../org/apache/sis/buildtools/book/Characters.java | 0 .../apache/sis/buildtools/book/CodeColorizer.java | 0 .../apache/sis/buildtools/book/package-info.java | 0 .../sis/buildtools/coding/ReorganizeImports.java | 78 +++---- .../buildtools/coding/VerifyVersionInJavadoc.java | 0 .../apache/sis/buildtools/coding/package-info.java | 0 .../org/apache/sis/buildtools/doclet/Doclet.java | 0 .../org/apache/sis/buildtools/doclet/Include.java | 0 .../org/apache/sis/buildtools/doclet/Rewriter.java | 0 .../org/apache/sis/buildtools/doclet/Taglet.java | 0 .../apache/sis/buildtools/doclet/package-info.java | 0 .../apache/sis/buildtools/gradle/Assembler.java | 0 .../apache/sis/buildtools/gradle/BuildHelper.java | 0 .../apache/sis/buildtools/gradle/Conventions.java | 0 .../apache/sis/buildtools/gradle/Dependency.java | 0 .../apache/sis/buildtools/gradle/JavaMaker.java | 0 .../sis/buildtools/gradle/ModularCompilation.java | 0 .../apache/sis/buildtools/gradle/ModularJAR.java | 0 .../sis/buildtools/gradle/ModularJavadoc.java | 0 .../sis/buildtools/gradle/ModularPublishing.java | 0 .../sis/buildtools/gradle/ModularSources.java | 0 .../apache/sis/buildtools/gradle/ModularTest.java | 0 .../sis/buildtools/gradle/SISBuildException.java | 0 .../org/apache/sis/buildtools/gradle/UnoPkg.java | 0 .../apache/sis/buildtools/gradle/ZipWriter.java | 0 .../apache/sis/buildtools/gradle/package-info.java | 0 .../org/apache/sis/buildtools/maven/Element.java | 0 .../org/apache/sis/buildtools/maven/Generator.java | 0 .../apache/sis/buildtools/maven/package-info.java | 0 .../sis/buildtools/maven/workaround/Argument.java | 0 .../maven/workaround/ProxyGenerator.java | 0 .../buildtools/maven/workaround/package-info.java | 0 .../resources/IndexedResourceCompiler.java | 0 .../sis/buildtools/resources/package-info.java | 0 .../main/kotlin/sis.library-conventions.gradle.kts | 68 ++++++ .../org/apache/sis/buildtools/book/GEOAPI.lst | 0 .../org/apache/sis/buildtools/book/OGC.lst | 0 .../org/apache/sis/buildtools/book/SIS.lst | 0 .../org/apache/sis/buildtools/book/XML_PREFIX.lst | 0 .../resources/IndexedResourceCompilerTest.java | 0 endorsed/build.gradle.kts | 27 +-- .../main/org/apache/sis/console/package-info.java | 2 +- .../sis/coverage/grid/DimensionAppender.java | 184 ++++++++++++++++ .../sis/coverage/grid/DimensionalityReduction.java | 15 +- .../sis/coverage/grid/GridCoverageProcessor.java | 87 +++++++- .../org/apache/sis/coverage/grid/GridExtent.java | 69 +++++- .../org/apache/sis/coverage/grid/GridGeometry.java | 63 +++++- .../sis/coverage/grid/j2d/SampleModelFactory.java | 4 +- .../org/apache/sis/feature/internal/Resources.java | 10 + .../sis/feature/internal/Resources.properties | 2 + .../sis/feature/internal/Resources_fr.properties | 2 + .../org/apache/sis/filter/AssociationValue.java | 7 +- .../org/apache/sis/filter/ComparisonFilter.java | 2 +- .../main/org/apache/sis/filter/PropertyValue.java | 18 +- .../apache/sis/filter/internal/FunctionNames.java | 2 +- .../main/org/apache/sis/filter/internal/XPath.java | 74 +++++-- .../main/org/apache/sis/filter/sqlmm/Registry.java | 4 +- .../apache/sis/geometry/wrapper/j2d/Polyline.java | 4 +- .../main/org/apache/sis/image/MaskedImage.java | 2 +- .../main/org/apache/sis/image/PixelIterator.java | 2 +- .../main/org/apache/sis/image/PlanarImage.java | 6 +- .../apache/sis/image/processing/TiledProcess.java | 6 +- .../sis/coverage/grid/DimensionAppenderTest.java | 131 +++++++++++ .../coverage/grid/DimensionalityReductionTest.java | 4 +- .../apache/sis/coverage/grid/GridExtentTest.java | 115 +++++----- .../apache/sis/coverage/grid/GridGeometryTest.java | 140 +++++++----- .../test/org/apache/sis/filter/XPathTest.java | 20 ++ .../test/org/apache/sis/image/TiledImageMock.java | 6 +- .../gazetteer/GeohashReferenceSystem.java | 6 +- .../main/org/apache/sis/referencing/CommonCRS.java | 68 ++++-- .../factory/CommonAuthorityFactory.java | 4 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../org/apache/sis/referencing/util/Formulas.java | 2 +- .../org/apache/sis/referencing/CommonCRSTest.java | 1 + .../apache/sis/storage/landsat/LandsatStore.java | 2 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 5 +- .../sis/storage/geotiff/MultiResolutionImage.java | 4 +- .../org/apache/sis/storage/geotiff/Writer.java | 2 +- .../geotiff/inflater/CompressionChannel.java | 4 +- .../geotiff/inflater/HorizontalPredictor.java | 4 +- .../sis/storage/geotiff/inflater/Inflater.java | 5 +- .../storage/geotiff/inflater/PredictorChannel.java | 4 +- .../sis/storage/geotiff/writer/TileMatrix.java | 4 +- .../org/apache/sis/storage/geotiff/WriterTest.java | 9 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 4 +- .../sis/storage/sql/postgis/RasterReader.java | 4 +- .../org.apache.sis.storage/main/module-info.java | 1 + .../main/org/apache/sis/io/stream/IOUtilities.java | 16 ++ .../main/org/apache/sis/io/stream/Region.java | 2 +- .../sis/storage/AbstractGridCoverageResource.java | 21 +- .../main/org/apache/sis/storage/FeatureQuery.java | 18 +- .../apache/sis/storage/GridCoverageResource.java | 23 +- .../org/apache/sis/storage/StorageConnector.java | 35 ++- .../aggregate/ConcatenatedGridCoverage.java | 27 ++- .../aggregate/ConcatenatedGridResource.java | 5 +- .../sis/storage/aggregate/CoverageAggregator.java | 162 +++++++++++++- .../sis/storage/aggregate/DimensionAppender.java | 244 +++++++++++++++++++++ .../apache/sis/storage/aggregate/package-info.java | 2 +- .../apache/sis/storage/base/TiledGridCoverage.java | 2 +- .../org/apache/sis/storage/csv/StoreProvider.java | 2 +- .../apache/sis/storage/esri/CharactersView.java | 6 +- .../org/apache/sis/storage/esri/RasterStore.java | 14 -- .../apache/sis/storage/esri/RawRasterReader.java | 2 +- .../apache/sis/storage/esri/RawRasterStore.java | 2 +- .../main/org/apache/sis/storage/folder/Store.java | 46 ++-- .../apache/sis/storage/folder/WritableStore.java | 5 +- .../src/org.apache.sis.util/main/module-info.java | 2 + .../main/org/apache/sis/math/DecimalFunctions.java | 15 +- .../main/org/apache/sis/math/Fraction.java | 9 +- .../main/org/apache/sis/math/MathFunctions.java | 7 +- .../org/apache/sis/measure/QuantityFormat.java | 20 +- .../apache/sis/measure/SexagesimalConverter.java | 3 +- .../main/org/apache/sis/measure/package-info.java | 2 +- .../sis/pending/jdk/{JDK17.java => JDK13.java} | 42 +--- .../main/org/apache/sis/pending/jdk/JDK16.java | 31 +-- .../main/org/apache/sis/pending/jdk/JDK18.java | 65 ++++++ .../sis/pending/jdk/{Record.java => JDK19.java} | 19 +- .../main/org/apache/sis/system/Modules.java | 5 - .../main/org/apache/sis/util/ArraysExt.java | 39 +++- .../main/org/apache/sis/util/Classes.java | 19 +- .../org/apache/sis/util/collection/Containers.java | 4 + .../org/apache/sis/util/internal/DoubleDouble.java | 3 +- .../org/apache/sis/util/internal/Numerics.java | 87 +++----- .../main/org/apache/sis/util/logging/Logging.java | 17 +- .../org/apache/sis/util/resources/Vocabulary.java | 10 + .../sis/util/resources/Vocabulary.properties | 2 + .../sis/util/resources/Vocabulary_fr.properties | 2 + .../org/apache/sis/math/MathFunctionsTest.java | 12 +- .../org/apache/sis/util/internal/NumericsTest.java | 11 +- incubator/build.gradle.kts | 24 +- .../sis/storage/shapefile/ShapefileStore.java | 66 +++++- .../apache/sis/storage/shapefile/dbf/DBFField.java | 2 +- .../sis/storage/shapefile/dbf/DBFHeader.java | 2 +- .../sis/storage/shapefile/dbf/DBFReader.java | 4 +- .../sis/storage/shapefile/shp/ShapeHeader.java | 2 +- .../sis/storage/shapefile/ShapefileStoreTest.java | 196 +++++++++-------- optional/build.gradle.kts | 25 +-- 142 files changed, 1987 insertions(+), 711 deletions(-) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/book/Assembler.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/book/BookException.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/book/Characters.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/book/CodeColorizer.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/book/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/coding/ReorganizeImports.java (93%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/coding/VerifyVersionInJavadoc.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/coding/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/doclet/Doclet.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/doclet/Include.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/doclet/Rewriter.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/doclet/Taglet.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/doclet/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/Assembler.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/BuildHelper.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/Conventions.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/Dependency.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/JavaMaker.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularCompilation.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularJAR.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularJavadoc.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularPublishing.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularSources.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ModularTest.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/SISBuildException.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/UnoPkg.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/ZipWriter.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/gradle/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/Element.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/Generator.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/workaround/Argument.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/workaround/ProxyGenerator.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/maven/workaround/package-info.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/resources/IndexedResourceCompiler.java (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/java}/org/apache/sis/buildtools/resources/package-info.java (100%) create mode 100644 buildSrc/src/main/kotlin/sis.library-conventions.gradle.kts rename buildSrc/src/{org.apache.sis.buildtools/main => main/resources}/org/apache/sis/buildtools/book/GEOAPI.lst (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/resources}/org/apache/sis/buildtools/book/OGC.lst (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/resources}/org/apache/sis/buildtools/book/SIS.lst (100%) rename buildSrc/src/{org.apache.sis.buildtools/main => main/resources}/org/apache/sis/buildtools/book/XML_PREFIX.lst (100%) rename buildSrc/src/{org.apache.sis.buildtools/test => test/java}/org/apache/sis/buildtools/resources/IndexedResourceCompilerTest.java (100%) create mode 100644 endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java create mode 100644 endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionAppenderTest.java create mode 100644 endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java rename endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/{JDK17.java => JDK13.java} (61%) copy optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java => endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/JDK16.java (58%) create mode 100644 endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/JDK18.java copy endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/{Record.java => JDK19.java} (68%)