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 31661225fedb4143a27e79154918bde623520616 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Jun 10 15:29:57 2023 +0200 Move `TemporalUtilities` to the metadata modules since it is not needed by the utility modules. This change has an impact on the services that the module declares to use. --- .../src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java | 2 +- .../main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +- .../main/java/org/apache/sis/internal/metadata}/TemporalUtilities.java | 2 +- .../java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java | 2 +- .../java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java | 2 +- .../src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java | 2 +- .../src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java index 042b580599..236d7bdf09 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java @@ -24,7 +24,7 @@ import org.opengis.temporal.TemporalPrimitive; import org.apache.sis.internal.xml.XmlUtilities; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.internal.jaxb.gco.PropertyType; -import org.apache.sis.internal.util.TemporalUtilities; +import org.apache.sis.internal.metadata.TemporalUtilities; import org.apache.sis.util.resources.Errors; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java index 370d7e2cef..3d7c2aa862 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java @@ -28,7 +28,7 @@ import org.opengis.util.InternationalString; import org.apache.sis.internal.jaxb.Context; import org.apache.sis.internal.xml.XmlUtilities; import org.apache.sis.internal.jaxb.gco.PropertyType; -import org.apache.sis.internal.util.TemporalUtilities; +import org.apache.sis.internal.metadata.TemporalUtilities; import org.apache.sis.util.SimpleInternationalString; diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TemporalUtilities.java similarity index 99% rename from core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java rename to core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TemporalUtilities.java index 4d991af9b0..48c23bb4dd 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TemporalUtilities.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.util; +package org.apache.sis.internal.metadata; import java.util.Date; import java.util.ServiceLoader; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java index 5770a1f7ec..471786521b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java @@ -29,7 +29,7 @@ import org.opengis.metadata.extent.TemporalExtent; import org.opengis.metadata.extent.SpatialTemporalExtent; import org.opengis.referencing.operation.TransformException; import org.apache.sis.metadata.iso.ISOMetadata; -import org.apache.sis.internal.util.TemporalUtilities; +import org.apache.sis.internal.metadata.TemporalUtilities; import org.apache.sis.internal.metadata.ReferencingServices; import org.apache.sis.xml.NilObject; import org.apache.sis.xml.NilReason; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java index 035283d694..732565c00b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java @@ -39,7 +39,7 @@ import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.internal.xml.LegacyNamespaces; import org.apache.sis.internal.jaxb.gml.TM_Primitive; import org.apache.sis.internal.jaxb.metadata.MD_Scope; -import org.apache.sis.internal.util.TemporalUtilities; +import org.apache.sis.internal.metadata.TemporalUtilities; /** diff --git a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java index 5f5e2d677c..90aff5ab53 100644 --- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java +++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java @@ -47,7 +47,7 @@ import org.apache.sis.util.collection.TableColumn; import org.apache.sis.util.resources.Errors; import org.apache.sis.xml.XML; -import static org.apache.sis.internal.util.TemporalUtilities.toDate; +import static org.apache.sis.internal.metadata.TemporalUtilities.toDate; /** diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java index 98f63187fe..6ef4948732 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/CRSBuilder.java @@ -52,7 +52,7 @@ import org.apache.sis.referencing.crs.DefaultGeocentricCRS; import org.apache.sis.referencing.factory.InvalidGeodeticParameterException; import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory; import org.apache.sis.internal.referencing.provider.Equirectangular; -import org.apache.sis.internal.util.TemporalUtilities; +import org.apache.sis.internal.metadata.TemporalUtilities; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.DataStoreException; import org.apache.sis.util.resources.Errors;
