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 2023/10/28 15:27:47 UTC
(sis) branch geoapi-4.0 updated: Automatic reordering and branch-separation of import statements. This is done by the `org.apache.sis.buildtools.coding.ReorganizeImports` tool in buildSrc for putting Java imports first, then Jakarta, then OpenGIS, and finally Apache SIS. The most important thing is that `ReorganizeImports` creates separated sections for imports that are not the same between the "geoapi-4.0", "geoapi-3.1" and "main" branches.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 53ac462e63 Automatic reordering and branch-separation of import statements. This is done by the `org.apache.sis.buildtools.coding.ReorganizeImports` tool in buildSrc for putting Java imports first, then Jakarta, then OpenGIS, and finally Apache SIS. The most important thing is that `ReorganizeImports` creates separated sections for imports that are not the same between the "geoapi-4.0", "geoapi-3.1" and "main" branches.
53ac462e63 is described below
commit 53ac462e63222bdd509df494f0eae06440bf2bce
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Oct 28 16:46:51 2023 +0200
Automatic reordering and branch-separation of import statements.
This is done by the `org.apache.sis.buildtools.coding.ReorganizeImports` tool in buildSrc for putting Java imports first, then Jakarta, then OpenGIS, and finally Apache SIS.
The most important thing is that `ReorganizeImports` creates separated sections for imports that are not the same between the "geoapi-4.0", "geoapi-3.1" and "main" branches.
---
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../org/apache/sis/storage/geotiff/Writer.java | 4 ++--
.../sis/storage/geotiff/writer/GeoEncoder.java | 9 +++++----
.../storage/geotiff/writer/ReformattedImage.java | 3 ++-
.../org/apache/sis/storage/geotiff/WriterTest.java | 7 ++++---
.../apache/sis/storage/base/MetadataFetcher.java | 8 +++++---
.../sis/io/stream/HyperRectangleWriterTest.java | 6 ++++--
.../apache/sis/io/stream/UpdatableWriteTest.java | 6 ++++--
.../storage/coveragejson/CoverageJsonStore.java | 22 +++++++++++-----------
.../coveragejson/CoverageJsonStoreProvider.java | 8 ++++----
.../sis/storage/coveragejson/CoverageResource.java | 22 ++++++++++++----------
.../sis/storage/coveragejson/binding/Axe.java | 4 ++--
.../sis/storage/coveragejson/binding/Axes.java | 2 +-
.../sis/storage/coveragejson/binding/Category.java | 2 +-
.../coveragejson/binding/CategoryEncoding.java | 4 ++--
.../sis/storage/coveragejson/binding/Coverage.java | 6 +++---
.../coveragejson/binding/CoverageCollection.java | 4 ++--
.../storage/coveragejson/binding/Dictionary.java | 4 ++--
.../sis/storage/coveragejson/binding/Domain.java | 4 ++--
.../coveragejson/binding/GeographicCRS.java | 2 +-
.../sis/storage/coveragejson/binding/I18N.java | 8 ++++----
.../storage/coveragejson/binding/IdentifierRS.java | 2 +-
.../sis/storage/coveragejson/binding/NdArray.java | 4 ++--
.../coveragejson/binding/ObservedProperty.java | 4 ++--
.../storage/coveragejson/binding/Parameter.java | 2 +-
.../coveragejson/binding/ParameterGroup.java | 4 ++--
.../storage/coveragejson/binding/Parameters.java | 4 ++--
.../storage/coveragejson/binding/ProjectedCRS.java | 2 +-
.../sis/storage/coveragejson/binding/Ranges.java | 4 ++--
.../binding/ReferenceSystemConnection.java | 4 ++--
.../sis/storage/coveragejson/binding/Symbol.java | 2 +-
.../coveragejson/binding/TargetConcept.java | 2 +-
.../storage/coveragejson/binding/TemporalRS.java | 2 +-
.../sis/storage/coveragejson/binding/TileSet.java | 6 +++---
.../storage/coveragejson/binding/TiledNdArray.java | 4 ++--
.../sis/storage/coveragejson/binding/Unit.java | 2 +-
.../storage/coveragejson/binding/VerticalCRS.java | 2 +-
.../coveragejson/CoverageJsonStoreTest.java | 13 ++++++++-----
.../storage/coveragejson/binding/BindingTest.java | 13 ++++++++-----
42 files changed, 118 insertions(+), 101 deletions(-)
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index 77f1837e40..4d1389dec7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
@@ -52,11 +52,11 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Debug;
+import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.filter.sqlmm.SQLMM;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 681ba95571..9fa86d38b4 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -31,8 +31,8 @@ import org.apache.sis.metadata.internal.Dependencies;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.TestUtilities;
import org.apache.sis.xml.test.AnnotationConsistencyCheck;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index e6087b5719..f32962cc55 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -22,8 +22,8 @@ import java.nio.file.Files;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.system.DataDirectory;
import org.junit.Test;
-import org.apache.sis.test.ProjectDirectories;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.ProjectDirectories;
import org.apache.sis.xml.test.SchemaCompliance;
import static org.junit.Assume.*;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
index b787aac7b2..005a7855cd 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -60,9 +60,9 @@ import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.io.stream.IOUtilities;
import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.sql.MetadataStoreException;
+import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.util.internal.ListOfUnknownSize;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java
index d8dc3aca6b..f9644ed632 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java
@@ -43,10 +43,10 @@ import org.apache.sis.storage.ReadOnlyStorageException;
import org.apache.sis.storage.base.MetadataFetcher;
import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.io.stream.UpdatableWrite;
-import org.apache.sis.util.internal.Numerics;
-import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ArraysExt;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.resources.Errors;
import org.apache.sis.math.Fraction;
import org.apache.sis.storage.geotiff.writer.TagValue;
import org.apache.sis.storage.geotiff.writer.TileMatrix;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
index b4f8e3c212..4774e5b3ea 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
@@ -19,12 +19,10 @@ package org.apache.sis.storage.geotiff.writer;
import java.util.List;
import java.util.EnumMap;
import javax.measure.Unit;
-import javax.measure.quantity.Angle;
-import javax.measure.quantity.Length;
import javax.measure.UnitConverter;
import javax.measure.IncommensurableException;
-import static javax.imageio.plugins.tiff.GeoTIFFTagSet.TAG_GEO_ASCII_PARAMS;
-import static javax.imageio.plugins.tiff.GeoTIFFTagSet.TAG_GEO_DOUBLE_PARAMS;
+import javax.measure.quantity.Angle;
+import javax.measure.quantity.Length;
import org.opengis.util.FactoryException;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.spatial.CellGeometry;
@@ -68,6 +66,9 @@ import org.apache.sis.storage.geotiff.base.Resources;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.metadata.iso.citation.Citations;
+import static javax.imageio.plugins.tiff.GeoTIFFTagSet.TAG_GEO_ASCII_PARAMS;
+import static javax.imageio.plugins.tiff.GeoTIFFTagSet.TAG_GEO_DOUBLE_PARAMS;
+
/**
* Helper class for writing GeoKeys.
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/ReformattedImage.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/ReformattedImage.java
index a7008d005e..cc3d0add12 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/ReformattedImage.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/ReformattedImage.java
@@ -22,7 +22,6 @@ import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
import java.awt.image.SampleModel;
-import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.math.Statistics;
import org.apache.sis.image.PlanarImage;
@@ -30,6 +29,8 @@ import org.apache.sis.image.ImageProcessor;
import org.apache.sis.coverage.grid.j2d.ImageUtilities;
import org.apache.sis.storage.IncompatibleResourceException;
+import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
+
/**
* An image prepared for writing with bands separated in the way they are stored in a TIFF file.
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
index a6e235f514..8e1622fa13 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
@@ -24,14 +24,13 @@ import java.util.stream.Collectors;
import java.lang.reflect.Array;
import java.io.OutputStream;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.awt.image.DataBuffer;
import java.awt.image.SampleModel;
import javax.imageio.plugins.tiff.TIFFTag;
-import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
import org.opengis.referencing.crs.ProjectedCRS;
import org.apache.sis.io.stream.ByteArrayChannel;
import org.apache.sis.io.stream.ChannelDataOutput;
@@ -45,6 +44,8 @@ import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.image.DataType;
+import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
+
// Test dependencies
import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.crs.HardCodedCRS;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
index d02ccefe7c..7a60ecb1f7 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
@@ -25,13 +25,10 @@ import java.util.function.BiPredicate;
import java.util.function.Function;
import org.opengis.util.CodeList;
import org.opengis.util.InternationalString;
-import org.apache.sis.util.collection.CodeListSet;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.citation.CitationDate;
import org.opengis.metadata.citation.DateType;
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
import org.opengis.metadata.citation.Series;
import org.opengis.metadata.identification.Identification;
import org.opengis.metadata.lineage.Lineage;
@@ -43,6 +40,11 @@ import org.opengis.metadata.spatial.CellGeometry;
import org.opengis.metadata.spatial.Georectified;
import org.opengis.metadata.spatial.SpatialRepresentation;
import org.opengis.metadata.spatial.GridSpatialRepresentation;
+import org.apache.sis.util.collection.CodeListSet;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.metadata.citation.Party;
+import org.opengis.metadata.citation.Responsibility;
/**
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java
index 67ff0abd68..c17ad9ba4f 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java
@@ -22,9 +22,11 @@ import java.lang.reflect.Array;
import java.util.Random;
import java.util.function.IntFunction;
import java.util.function.ToDoubleFunction;
-import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.TestCase;
+
+// Test dependencies
import org.junit.Test;
+import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/UpdatableWriteTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/UpdatableWriteTest.java
index d6c275c838..ace6c1b2cd 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/UpdatableWriteTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/UpdatableWriteTest.java
@@ -23,9 +23,11 @@ import java.util.Random;
import java.util.function.Function;
import java.util.function.BiFunction;
import java.util.function.BiConsumer;
-import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.TestCase;
+
+// Test dependencies
import org.junit.Test;
+import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java
index 07eb67bbd0..814c31fed1 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java
@@ -16,9 +16,6 @@
*/
package org.apache.sis.storage.coveragejson;
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.JsonbBuilder;
-import jakarta.json.bind.JsonbConfig;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -31,13 +28,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
+import org.opengis.metadata.Metadata;
+import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.coverage.grid.GridCoverage;
-import org.apache.sis.storage.coveragejson.binding.Coverage;
-import org.apache.sis.storage.coveragejson.binding.CoverageCollection;
-import org.apache.sis.storage.coveragejson.binding.CoverageJsonObject;
-import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.storage.base.URIDataStore;
-import org.apache.sis.io.stream.IOUtilities;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.GridCoverageResource;
@@ -45,8 +41,12 @@ import org.apache.sis.storage.NoSuchDataException;
import org.apache.sis.storage.Resource;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.WritableAggregate;
-import org.opengis.metadata.Metadata;
-import org.opengis.parameter.ParameterValueGroup;
+import org.apache.sis.storage.coveragejson.binding.Coverage;
+import org.apache.sis.storage.coveragejson.binding.CoverageCollection;
+import org.apache.sis.storage.coveragejson.binding.CoverageJsonObject;
+import org.apache.sis.storage.base.MetadataBuilder;
+import org.apache.sis.storage.base.URIDataStore;
+import org.apache.sis.io.stream.IOUtilities;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStoreProvider.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStoreProvider.java
index ab272fed38..7e84195424 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStoreProvider.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStoreProvider.java
@@ -18,9 +18,7 @@ package org.apache.sis.storage.coveragejson;
import java.net.URI;
import java.util.logging.Logger;
-import org.apache.sis.storage.base.Capability;
-import org.apache.sis.storage.base.StoreMetadata;
-import org.apache.sis.storage.base.URIDataStore;
+import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.storage.Aggregate;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
@@ -28,8 +26,10 @@ import org.apache.sis.storage.DataStoreProvider;
import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.storage.StorageConnector;
+import org.apache.sis.storage.base.Capability;
+import org.apache.sis.storage.base.StoreMetadata;
+import org.apache.sis.storage.base.URIDataStore;
import org.apache.sis.util.Version;
-import org.opengis.parameter.ParameterDescriptorGroup;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
index 305c924a72..db4aeaf0ce 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
@@ -36,6 +36,13 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.measure.Unit;
+import org.opengis.metadata.spatial.DimensionNameType;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.datum.PixelInCell;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.MathTransform1D;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.FactoryException;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.BufferedGridCoverage;
import org.apache.sis.coverage.grid.DisjointExtentException;
@@ -44,6 +51,9 @@ import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridRoundingMode;
import org.apache.sis.image.PixelIterator;
+import org.apache.sis.storage.AbstractGridCoverageResource;
+import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.storage.NoSuchDataException;
import org.apache.sis.storage.coveragejson.binding.Axe;
import org.apache.sis.storage.coveragejson.binding.Axes;
import org.apache.sis.storage.coveragejson.binding.Category;
@@ -71,17 +81,9 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.storage.AbstractGridCoverageResource;
-import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.storage.NoSuchDataException;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.coverage.grid.SequenceType;
-import org.opengis.metadata.spatial.DimensionNameType;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.datum.PixelInCell;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.MathTransform1D;
-import org.opengis.referencing.operation.Matrix;
-import org.opengis.util.FactoryException;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axe.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axe.java
index 324f414de8..5df56371ef 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axe.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axe.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axes.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axes.java
index b1602c4a04..0ec47cb7db 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axes.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Axes.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Category.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Category.java
index 34889acf80..c75c805bfc 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Category.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Category.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CategoryEncoding.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CategoryEncoding.java
index 6eff1833ed..09c7f49653 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CategoryEncoding.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CategoryEncoding.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.lang.reflect.Type;
+import java.util.Map;
import jakarta.json.bind.annotation.JsonbTypeDeserializer;
import jakarta.json.bind.annotation.JsonbTypeSerializer;
import jakarta.json.bind.serializer.DeserializationContext;
@@ -24,8 +26,6 @@ import jakarta.json.bind.serializer.JsonbSerializer;
import jakarta.json.bind.serializer.SerializationContext;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonParser;
-import java.lang.reflect.Type;
-import java.util.Map;
import org.apache.sis.storage.coveragejson.binding.CategoryEncoding.Deserializer;
import org.apache.sis.storage.coveragejson.binding.CategoryEncoding.Serializer;
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Coverage.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Coverage.java
index c1d96551ce..435ee435cf 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Coverage.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Coverage.java
@@ -16,15 +16,15 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Objects;
import jakarta.json.bind.JsonbException;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
import jakarta.json.bind.serializer.DeserializationContext;
import jakarta.json.bind.serializer.JsonbDeserializer;
import jakarta.json.stream.JsonParser;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CoverageCollection.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CoverageCollection.java
index b2308c6e25..decbb37efc 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CoverageCollection.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/CoverageCollection.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Dictionary.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Dictionary.java
index e8cb5071df..2d410a80bc 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Dictionary.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Dictionary.java
@@ -16,11 +16,11 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.LinkedHashMap;
+import java.util.Map;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.annotation.JsonbTransient;
-import java.util.LinkedHashMap;
-import java.util.Map;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Domain.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Domain.java
index 1d655b183c..31ed0a64e9 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Domain.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Domain.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/GeographicCRS.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/GeographicCRS.java
index bbd757ef7d..f88f625fd6 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/GeographicCRS.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/GeographicCRS.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/I18N.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/I18N.java
index fd96f88578..04905ae3c6 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/I18N.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/I18N.java
@@ -16,6 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.lang.reflect.Type;
+import java.util.Locale;
+import java.util.Map;
import jakarta.json.bind.annotation.JsonbTypeDeserializer;
import jakarta.json.bind.annotation.JsonbTypeSerializer;
import jakarta.json.bind.serializer.DeserializationContext;
@@ -24,11 +27,8 @@ import jakarta.json.bind.serializer.JsonbSerializer;
import jakarta.json.bind.serializer.SerializationContext;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonParser;
-import java.lang.reflect.Type;
-import java.util.Locale;
-import java.util.Map;
-import org.apache.sis.storage.coveragejson.binding.I18N.Serializer;
import org.opengis.util.InternationalString;
+import org.apache.sis.storage.coveragejson.binding.I18N.Serializer;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/IdentifierRS.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/IdentifierRS.java
index 26c0117323..a418b23f27 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/IdentifierRS.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/IdentifierRS.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/NdArray.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/NdArray.java
index 7af9c3f2ba..197030b6ac 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/NdArray.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/NdArray.java
@@ -16,11 +16,11 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ObservedProperty.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ObservedProperty.java
index f9981bb8cb..3eee91a537 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ObservedProperty.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ObservedProperty.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameter.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameter.java
index 50b3bd21d1..bf83f26a30 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameter.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameter.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ParameterGroup.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ParameterGroup.java
index 0519110283..6ec5f23d04 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ParameterGroup.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ParameterGroup.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.Arrays;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameters.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameters.java
index ebce911075..2902592ffe 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameters.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Parameters.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.lang.reflect.Type;
+import java.util.Map;
import jakarta.json.bind.annotation.JsonbTypeDeserializer;
import jakarta.json.bind.annotation.JsonbTypeSerializer;
import jakarta.json.bind.serializer.DeserializationContext;
@@ -25,8 +27,6 @@ import jakarta.json.bind.serializer.SerializationContext;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonParser;
import jakarta.json.stream.JsonParser.Event;
-import java.lang.reflect.Type;
-import java.util.Map;
import org.apache.sis.storage.coveragejson.binding.Parameters.Deserializer;
import org.apache.sis.storage.coveragejson.binding.Parameters.Serializer;
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ProjectedCRS.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ProjectedCRS.java
index d99f33da36..0b156891f0 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ProjectedCRS.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ProjectedCRS.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Ranges.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Ranges.java
index 9b77013222..6e16a9e1bf 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Ranges.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Ranges.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.lang.reflect.Type;
+import java.util.Map.Entry;
import jakarta.json.bind.annotation.JsonbTypeDeserializer;
import jakarta.json.bind.annotation.JsonbTypeSerializer;
import jakarta.json.bind.serializer.DeserializationContext;
@@ -24,8 +26,6 @@ import jakarta.json.bind.serializer.JsonbSerializer;
import jakarta.json.bind.serializer.SerializationContext;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonParser;
-import java.lang.reflect.Type;
-import java.util.Map.Entry;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ReferenceSystemConnection.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ReferenceSystemConnection.java
index a15d6b02f6..35e17c7fc6 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ReferenceSystemConnection.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/ReferenceSystemConnection.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.List;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Symbol.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Symbol.java
index 0f4f4cb3db..c7f1c4d7e6 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Symbol.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Symbol.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TargetConcept.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TargetConcept.java
index 70e371c067..ac777633ce 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TargetConcept.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TargetConcept.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TemporalRS.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TemporalRS.java
index dd27f8d6dc..3952e78ced 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TemporalRS.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TemporalRS.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TileSet.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TileSet.java
index 144f7f26eb..ba93b12cf3 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TileSet.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TileSet.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.Arrays;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
@@ -46,7 +46,7 @@ public final class TileSet extends Dictionary<Object> {
* The URI template MUST contain a variable for each axis name whose
* corresponding element in "tileShape" is not null. A variable for an
* axis of total size totalSize (from "shape") and tile size tileSize
- * (from "tileShape") has as value one of the integers 0, 1, …, q + r - 1
+ * (from "tileShape") has as value one of the integers 0, 1, …, q + r - 1
* where q and r are the quotient and remainder obtained by dividing
* totalSize by tileSize. Each URI that can be generated from the URI
* template MUST resolve to an NdArray CoverageJSON document where the
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TiledNdArray.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TiledNdArray.java
index 3da50651ca..76b55c7fff 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TiledNdArray.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/TiledNdArray.java
@@ -16,10 +16,10 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.bind.annotation.JsonbNillable;
-import jakarta.json.bind.annotation.JsonbPropertyOrder;
import java.util.Arrays;
import java.util.Objects;
+import jakarta.json.bind.annotation.JsonbNillable;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Unit.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Unit.java
index 8114edc85c..87b9490339 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Unit.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/Unit.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/VerticalCRS.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/VerticalCRS.java
index b5717382a7..43b90e7f42 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/VerticalCRS.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/binding/VerticalCRS.java
@@ -16,9 +16,9 @@
*/
package org.apache.sis.storage.coveragejson.binding;
+import java.util.Objects;
import jakarta.json.bind.annotation.JsonbNillable;
import jakarta.json.bind.annotation.JsonbPropertyOrder;
-import java.util.Objects;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
index 3866b60c0c..911e445581 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/CoverageJsonStoreTest.java
@@ -24,14 +24,12 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import org.opengis.util.FactoryException;
+import org.opengis.metadata.spatial.DimensionNameType;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridCoverageBuilder;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridOrientation;
-import org.apache.sis.storage.base.MemoryGridResource;
-import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.storage.Aggregate;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
@@ -39,9 +37,14 @@ import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.Resource;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.WritableAggregate;
-import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.storage.base.MemoryGridResource;
+import org.apache.sis.referencing.CRS;
+import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import org.junit.Test;
-import org.opengis.metadata.spatial.DimensionNameType;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
diff --git a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
index 66a60c7044..65dc7a1f31 100644
--- a/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
+++ b/incubator/src/org.apache.sis.storage.coveragejson/test/org/apache/sis/storage/coveragejson/binding/BindingTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.sis.storage.coveragejson.binding;
-import jakarta.json.JsonObject;
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.JsonbBuilder;
-import jakarta.json.bind.JsonbConfig;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -31,12 +27,19 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import jakarta.json.JsonObject;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
import org.eclipse.yasson.YassonConfig;
+
+// Test dependencies
import org.junit.AfterClass;
-import static org.junit.jupiter.api.Assertions.*;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
/**
* Test coverage-json bindings.