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 2026/08/15 18:12:11 UTC

(sis) branch main updated (b8782f1029 -> 83c629cdbb)

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git


    from b8782f1029 Merge branch 'geoapi-3.1'. The DGGS module has been temporarily excluded because it depends on the geometry module, which is available only in the GeoAPI 3.1/4.0 branches.
     add b967e38433 Post-merge automatic reorganization of imports order.
     add 3ed0c5f895 Merge of automatic reorganization of imports order.
     new 83c629cdbb Merge of automatic reorganization of imports order.

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:
 .../apache/sis/coverage/grid/GridCRSBuilder.java   |  2 +-
 .../sis/coverage/grid/GridDerivationTest.java      |  2 +-
 .../apache/sis/map/coverage/RenderingDataTest.java |  2 +-
 .../sis/storage/geotiff/reader/CRSBuilder.java     |  6 ++--
 .../sis/storage/netcdf/base/GridMapping.java       |  2 +-
 .../apache/sis/storage/netcdf/NetcdfStoreTest.java |  4 +--
 .../org/apache/sis/storage/esri/RasterStore.java   |  2 +-
 .../storage/coveragejson/CoverageJsonStore.java    |  2 +-
 .../sis/storage/coveragejson/binding/Axe.java      |  2 +-
 .../sis/storage/coveragejson/binding/Axes.java     |  2 +-
 .../sis/storage/coveragejson/binding/Category.java |  3 +-
 .../sis/storage/coveragejson/binding/Coverage.java |  8 ++---
 .../coveragejson/binding/CoverageCollection.java   |  2 +-
 .../coveragejson/binding/CoverageJsonObject.java   |  1 +
 .../sis/storage/coveragejson/binding/Domain.java   |  2 +-
 .../coveragejson/binding/GeographicCRS.java        |  2 +-
 .../storage/coveragejson/binding/IdentifierRS.java |  2 +-
 .../sis/storage/coveragejson/binding/NdArray.java  |  2 +-
 .../coveragejson/binding/ObservedProperty.java     |  2 +-
 .../storage/coveragejson/binding/Parameter.java    |  2 +-
 .../coveragejson/binding/ParameterGroup.java       |  2 +-
 .../storage/coveragejson/binding/ProjectedCRS.java |  2 +-
 .../binding/ReferenceSystemConnection.java         |  2 +-
 .../sis/storage/coveragejson/binding/Symbol.java   |  2 +-
 .../coveragejson/binding/TargetConcept.java        |  2 +-
 .../storage/coveragejson/binding/TemporalRS.java   |  2 +-
 .../sis/storage/coveragejson/binding/TileSet.java  |  2 +-
 .../storage/coveragejson/binding/TiledNdArray.java |  2 +-
 .../sis/storage/coveragejson/binding/Unit.java     |  2 +-
 .../storage/coveragejson/binding/VerticalCRS.java  |  2 +-
 .../org/apache/sis/storage/geojson/GeoJSON.java    | 25 +++++++++-------
 .../apache/sis/storage/geojson/GeoJSONMapper.java  | 35 ++++++++++++----------
 .../storage/geojson/binding/GeoJSONFeature.java    |  7 +++--
 .../geojson/binding/GeoJSONFeatureCollection.java  |  7 ++---
 .../storage/geojson/binding/GeoJSONGeometry.java   |  3 +-
 .../geojson/binding/GeoJSONGeometryCollection.java |  7 +++--
 .../storage/geojson/binding/GeoJSONLineString.java |  7 +++--
 .../geojson/binding/GeoJSONMultiLineString.java    |  7 +++--
 .../storage/geojson/binding/GeoJSONMultiPoint.java |  7 +++--
 .../geojson/binding/GeoJSONMultiPolygon.java       |  7 +++--
 .../sis/storage/geojson/binding/GeoJSONObject.java |  7 +++--
 .../sis/storage/geojson/binding/GeoJSONPoint.java  |  7 +++--
 .../storage/geojson/binding/GeoJSONPolygon.java    |  7 +++--
 .../geojson/binding/JSONFGCircularString.java      |  7 +++--
 .../geojson/binding/JSONFGCompoundCurve.java       |  7 +++--
 .../storage/geojson/binding/JSONFGCoordRefSys.java |  2 +-
 .../geojson/binding/JSONFGCurvePolygon.java        |  7 +++--
 .../storage/geojson/binding/JSONFGMeasures.java    |  3 +-
 .../storage/geojson/binding/JSONFGMultiCurve.java  |  7 +++--
 .../geojson/binding/JSONFGMultiPolyhedron.java     |  7 +++--
 .../storage/geojson/binding/JSONFGMultiPrism.java  |  7 +++--
 .../geojson/binding/JSONFGMultiSurface.java        |  7 +++--
 .../storage/geojson/binding/JSONFGPolyhedron.java  |  6 ++--
 .../sis/storage/geojson/binding/JSONFGPrism.java   |  3 +-
 .../sis/storage/geojson/binding/JSONFGTime.java    |  6 ++--
 .../sis/storage/json/DataTransferObject.java       |  5 ++--
 .../movingfeature/binding/MFCoordRefSys.java       |  3 +-
 .../movingfeature/binding/MFMovingFeature.java     |  7 +++--
 .../binding/MFMovingFeatureCollection.java         |  7 +++--
 .../binding/MFMovingGeometryBase.java              |  3 +-
 .../binding/MFMovingGeometryCollection.java        |  7 +++--
 .../movingfeature/binding/MFMovingLineString.java  |  7 +++--
 .../movingfeature/binding/MFMovingPoint.java       |  7 +++--
 .../movingfeature/binding/MFMovingPointCloud.java  |  7 +++--
 .../movingfeature/binding/MFMovingPolygon.java     |  7 +++--
 .../movingfeature/binding/MFOrientation.java       |  7 +++--
 .../movingfeature/binding/MFTemporalGeometry.java  |  3 +-
 .../binding/MFTemporalPrimitiveGeometry.java       |  7 +++--
 .../binding/MFTemporalPropertyGroup.java           |  7 +++--
 .../binding/MFTemporalPropertyValue.java           |  7 +++--
 .../main/org/apache/sis/storage/ogcjson/Link.java  |  3 +-
 .../storage/coveragejson/binding/BindingTest.java  |  2 +-
 .../sis/storage/geojson/binding/BindingTest.java   |  3 +-
 .../sis/storage/json/AbstractBindingTest.java      | 10 ++++---
 .../storage/movingfeature/binding/BindingTest.java |  3 +-
 75 files changed, 216 insertions(+), 170 deletions(-)

(sis) 01/01: Merge of automatic reorganization of imports order.

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 83c629cdbbde9d25a4a77d9863434b2245dbaf0e
Merge: b8782f1029 3ed0c5f895
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Aug 15 20:11:10 2026 +0200

    Merge of automatic reorganization of imports order.

 .../apache/sis/coverage/grid/GridCRSBuilder.java   |  2 +-
 .../sis/coverage/grid/GridDerivationTest.java      |  2 +-
 .../apache/sis/map/coverage/RenderingDataTest.java |  2 +-
 .../sis/storage/geotiff/reader/CRSBuilder.java     |  6 ++--
 .../sis/storage/netcdf/base/GridMapping.java       |  2 +-
 .../apache/sis/storage/netcdf/NetcdfStoreTest.java |  4 +--
 .../org/apache/sis/storage/esri/RasterStore.java   |  2 +-
 .../storage/coveragejson/CoverageJsonStore.java    |  2 +-
 .../sis/storage/coveragejson/binding/Axe.java      |  2 +-
 .../sis/storage/coveragejson/binding/Axes.java     |  2 +-
 .../sis/storage/coveragejson/binding/Category.java |  3 +-
 .../sis/storage/coveragejson/binding/Coverage.java |  8 ++---
 .../coveragejson/binding/CoverageCollection.java   |  2 +-
 .../coveragejson/binding/CoverageJsonObject.java   |  1 +
 .../sis/storage/coveragejson/binding/Domain.java   |  2 +-
 .../coveragejson/binding/GeographicCRS.java        |  2 +-
 .../storage/coveragejson/binding/IdentifierRS.java |  2 +-
 .../sis/storage/coveragejson/binding/NdArray.java  |  2 +-
 .../coveragejson/binding/ObservedProperty.java     |  2 +-
 .../storage/coveragejson/binding/Parameter.java    |  2 +-
 .../coveragejson/binding/ParameterGroup.java       |  2 +-
 .../storage/coveragejson/binding/ProjectedCRS.java |  2 +-
 .../binding/ReferenceSystemConnection.java         |  2 +-
 .../sis/storage/coveragejson/binding/Symbol.java   |  2 +-
 .../coveragejson/binding/TargetConcept.java        |  2 +-
 .../storage/coveragejson/binding/TemporalRS.java   |  2 +-
 .../sis/storage/coveragejson/binding/TileSet.java  |  2 +-
 .../storage/coveragejson/binding/TiledNdArray.java |  2 +-
 .../sis/storage/coveragejson/binding/Unit.java     |  2 +-
 .../storage/coveragejson/binding/VerticalCRS.java  |  2 +-
 .../org/apache/sis/storage/geojson/GeoJSON.java    | 25 +++++++++-------
 .../apache/sis/storage/geojson/GeoJSONMapper.java  | 35 ++++++++++++----------
 .../storage/geojson/binding/GeoJSONFeature.java    |  7 +++--
 .../geojson/binding/GeoJSONFeatureCollection.java  |  7 ++---
 .../storage/geojson/binding/GeoJSONGeometry.java   |  3 +-
 .../geojson/binding/GeoJSONGeometryCollection.java |  7 +++--
 .../storage/geojson/binding/GeoJSONLineString.java |  7 +++--
 .../geojson/binding/GeoJSONMultiLineString.java    |  7 +++--
 .../storage/geojson/binding/GeoJSONMultiPoint.java |  7 +++--
 .../geojson/binding/GeoJSONMultiPolygon.java       |  7 +++--
 .../sis/storage/geojson/binding/GeoJSONObject.java |  7 +++--
 .../sis/storage/geojson/binding/GeoJSONPoint.java  |  7 +++--
 .../storage/geojson/binding/GeoJSONPolygon.java    |  7 +++--
 .../geojson/binding/JSONFGCircularString.java      |  7 +++--
 .../geojson/binding/JSONFGCompoundCurve.java       |  7 +++--
 .../storage/geojson/binding/JSONFGCoordRefSys.java |  2 +-
 .../geojson/binding/JSONFGCurvePolygon.java        |  7 +++--
 .../storage/geojson/binding/JSONFGMeasures.java    |  3 +-
 .../storage/geojson/binding/JSONFGMultiCurve.java  |  7 +++--
 .../geojson/binding/JSONFGMultiPolyhedron.java     |  7 +++--
 .../storage/geojson/binding/JSONFGMultiPrism.java  |  7 +++--
 .../geojson/binding/JSONFGMultiSurface.java        |  7 +++--
 .../storage/geojson/binding/JSONFGPolyhedron.java  |  6 ++--
 .../sis/storage/geojson/binding/JSONFGPrism.java   |  3 +-
 .../sis/storage/geojson/binding/JSONFGTime.java    |  6 ++--
 .../sis/storage/json/DataTransferObject.java       |  5 ++--
 .../movingfeature/binding/MFCoordRefSys.java       |  3 +-
 .../movingfeature/binding/MFMovingFeature.java     |  7 +++--
 .../binding/MFMovingFeatureCollection.java         |  7 +++--
 .../binding/MFMovingGeometryBase.java              |  3 +-
 .../binding/MFMovingGeometryCollection.java        |  7 +++--
 .../movingfeature/binding/MFMovingLineString.java  |  7 +++--
 .../movingfeature/binding/MFMovingPoint.java       |  7 +++--
 .../movingfeature/binding/MFMovingPointCloud.java  |  7 +++--
 .../movingfeature/binding/MFMovingPolygon.java     |  7 +++--
 .../movingfeature/binding/MFOrientation.java       |  7 +++--
 .../movingfeature/binding/MFTemporalGeometry.java  |  3 +-
 .../binding/MFTemporalPrimitiveGeometry.java       |  7 +++--
 .../binding/MFTemporalPropertyGroup.java           |  7 +++--
 .../binding/MFTemporalPropertyValue.java           |  7 +++--
 .../main/org/apache/sis/storage/ogcjson/Link.java  |  3 +-
 .../storage/coveragejson/binding/BindingTest.java  |  2 +-
 .../sis/storage/geojson/binding/BindingTest.java   |  3 +-
 .../sis/storage/json/AbstractBindingTest.java      | 10 ++++---
 .../storage/movingfeature/binding/BindingTest.java |  3 +-
 75 files changed, 216 insertions(+), 170 deletions(-)

diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCRSBuilder.java
index 4217928a76,d29833ab1d..c1eecf0019
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCRSBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCRSBuilder.java
@@@ -69,11 -70,10 +70,10 @@@ import org.apache.sis.util.collection.B
  import org.apache.sis.util.internal.shared.Numerics;
  import org.apache.sis.util.iso.Types;
  import org.apache.sis.measure.Units;
- import org.apache.sis.util.resources.Errors;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.referencing.ObjectDomain;
 -import org.opengis.coordinate.MismatchedDimensionException;
 +// Specific to the main branch:
 +import org.opengis.referencing.datum.Datum;
 +import org.opengis.geometry.MismatchedDimensionException;
  
  
  /**
diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
index 237b30a2a0,0423be75b2..c496d2031b
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
@@@ -53,8 -52,9 +52,9 @@@ import static org.apache.sis.referencin
  import static org.apache.sis.feature.Assertions.assertGridToCenterEquals;
  import static org.apache.sis.feature.Assertions.assertGridToCornerEquals;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import static org.opengis.test.Assertions.assertBetween;
 -import static org.apache.sis.feature.Assertions.assertExtentEquals;
 +// Specific to the main branch:
++import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
 +import static org.apache.sis.test.GeoapiAssert.assertBetween;
  
  
  /**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index 48e71b5cb5,29f56e7cb8..4e2c71a6e8
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@@ -36,9 -36,9 +36,9 @@@ import org.junit.jupiter.api.Test
  import static org.junit.jupiter.api.Assertions.*;
  import org.apache.sis.storage.DataStoreTestCase;
  
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.test.dataset.TestData;
 -import static org.apache.sis.feature.Assertions.assertExtentEquals;
 +// Specific to the main branch:
- import org.apache.sis.storage.netcdf.base.TestData;
 +import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
++import org.apache.sis.storage.netcdf.base.TestData;
  
  
  /**
diff --cc incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSON.java
index ee2b202e19,236030a34f..d785856d52
--- a/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSON.java
+++ b/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSON.java
@@@ -33,15 -40,11 +40,11 @@@ import org.apache.sis.storage.geojson.b
  import org.apache.sis.storage.geojson.binding.GeoJSONMultiPolygon;
  import org.apache.sis.storage.geojson.binding.GeoJSONPoint;
  import org.apache.sis.storage.geojson.binding.GeoJSONPolygon;
- import org.locationtech.jts.geom.Coordinate;
- import org.locationtech.jts.geom.CoordinateXY;
- import org.locationtech.jts.geom.CoordinateXYZM;
- import org.locationtech.jts.geom.Geometry;
- import org.locationtech.jts.geom.GeometryFactory;
- import org.locationtech.jts.geom.LineString;
- import org.locationtech.jts.geom.LinearRing;
- import org.locationtech.jts.geom.Point;
- import org.locationtech.jts.geom.Polygon;
+ 
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.feature.Feature;
 -import org.opengis.feature.FeatureType;
++// Specific to the main branch:
++import org.apache.sis.feature.AbstractFeature;
++import org.apache.sis.feature.DefaultFeatureType;
+ 
  
  /**
   *
diff --cc incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSONMapper.java
index 65bc1df0f6,e417fa1249..3b9d8d5f85
--- a/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSONMapper.java
+++ b/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geojson/GeoJSONMapper.java
@@@ -43,17 -49,16 +49,14 @@@ import org.apache.sis.storage.geojson.b
  import org.apache.sis.storage.geojson.binding.GeoJSONMultiPolygon;
  import org.apache.sis.storage.geojson.binding.GeoJSONPoint;
  import org.apache.sis.storage.geojson.binding.GeoJSONPolygon;
- import org.locationtech.jts.geom.CoordinateSequence;
- import org.locationtech.jts.geom.Envelope;
- import org.locationtech.jts.geom.Geometry;
- import org.locationtech.jts.geom.GeometryCollection;
- import org.locationtech.jts.geom.LineString;
- import org.locationtech.jts.geom.MultiLineString;
- import org.locationtech.jts.geom.MultiPoint;
- import org.locationtech.jts.geom.MultiPolygon;
- import org.locationtech.jts.geom.Point;
- import org.locationtech.jts.geom.Polygon;
- import org.opengis.referencing.crs.CoordinateReferenceSystem;
+ 
 -// Specific to the geoapi-3.1 and geoapi-4.0 branches:
 -import org.opengis.feature.AttributeType;
 -import org.opengis.feature.Feature;
 -import org.opengis.feature.FeatureType;
 -import org.opengis.feature.IdentifiedType;
 -import org.opengis.feature.Operation;
 -import org.opengis.feature.PropertyNotFoundException;
 -import org.opengis.feature.PropertyType;
++// Specific to the main branch:
++import org.apache.sis.feature.AbstractFeature;
++import org.apache.sis.feature.AbstractIdentifiedType;
++import org.apache.sis.feature.AbstractOperation;
++import org.apache.sis.feature.DefaultAttributeType;
++import org.apache.sis.feature.DefaultFeatureType;
+ 
  
  /**
   *