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 2025/09/23 15:22:23 UTC
(sis) branch main updated (eaee561ab0 -> f4d97c35d8)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from eaee561ab0 Merge branch 'geoapi-3.1'
add 5092f522f7 Rename `*.privy` packages as `*.internal.shared` for making their purposes clearer. It should have no impact on user code as it is internal API. This is only a renaming with no change in the code.
add 5b57d58d6b Merge branch 'geoapi-4.0' into geoapi-3.1: renaming of the "privy" internal package.
new f4d97c35d8 Merge branch 'geoapi-3.1': renaming of the "privy" internal package.
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:
endorsed/build.gradle.kts | 6 +++---
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 2 +-
.../main/org/apache/sis/console/AboutCommand.java | 4 ++--
.../main/org/apache/sis/console/Command.java | 2 +-
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../apache/sis/console/FormattedOutputCommand.java | 2 +-
.../org/apache/sis/console/IdentifierCommand.java | 2 +-
.../apache/sis/console/ResourcesDownloader.java | 2 +-
.../org/apache/sis/console/TransformCommand.java | 8 ++++----
.../org.apache.sis.feature/main/module-info.java | 8 ++++----
.../org/apache/sis/coverage/CoverageCombiner.java | 6 +++---
.../org/apache/sis/coverage/SampleDimension.java | 2 +-
.../org/apache/sis/coverage/SampleRangeFormat.java | 2 +-
.../coverage/grid/BandAggregateGridCoverage.java | 4 ++--
.../sis/coverage/grid/ClippedGridCoverage.java | 2 +-
.../coverage/grid/CoordinateOperationFinder.java | 6 +++---
.../apache/sis/coverage/grid/DefaultEvaluator.java | 8 ++++----
.../sis/coverage/grid/DimensionAppender.java | 2 +-
.../apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../sis/coverage/grid/DimensionalityReduction.java | 2 +-
.../coverage/grid/FractionalGridCoordinates.java | 2 +-
.../org/apache/sis/coverage/grid/GridCoverage.java | 4 ++--
.../apache/sis/coverage/grid/GridCoverage2D.java | 6 +++---
.../sis/coverage/grid/GridCoverageBuilder.java | 8 ++++----
.../sis/coverage/grid/GridCoverageProcessor.java | 8 ++++----
.../apache/sis/coverage/grid/GridDerivation.java | 2 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 10 +++++-----
.../apache/sis/coverage/grid/GridExtentCRS.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 14 +++++++-------
.../apache/sis/coverage/grid/ImageRenderer.java | 12 ++++++------
.../sis/coverage/grid/ReducedGridCoverage.java | 2 +-
.../sis/coverage/grid/ResampledGridCoverage.java | 6 +++---
.../apache/sis/coverage/grid/SliceGeometry.java | 8 ++++----
.../shared}/BandAggregateArgument.java | 4 ++--
.../shared}/CommonDomainFinder.java | 6 +++---
.../{privy => internal/shared}/RangeArgument.java | 8 ++++----
.../shared}/SampleDimensions.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/feature/AbstractFeature.java | 2 +-
.../org/apache/sis/feature/CharacteristicMap.java | 8 ++++----
.../apache/sis/feature/CharacteristicTypeMap.java | 4 ++--
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 4 ++--
.../main/org/apache/sis/feature/DenseFeature.java | 4 ++--
.../org/apache/sis/feature/EnvelopeOperation.java | 4 ++--
.../apache/sis/feature/ExpressionOperation.java | 4 ++--
.../main/org/apache/sis/feature/FeatureFormat.java | 4 ++--
.../org/apache/sis/feature/FeatureOperations.java | 4 ++--
.../sis/feature/GroupAsPolylineOperation.java | 4 ++--
.../apache/sis/feature/MultiValuedAssociation.java | 2 +-
.../apache/sis/feature/MultiValuedAttribute.java | 4 ++--
.../org/apache/sis/feature/NamedFeatureType.java | 2 +-
.../org/apache/sis/feature/SingletonAttribute.java | 2 +-
.../main/org/apache/sis/feature/SparseFeature.java | 4 ++--
.../apache/sis/feature/StringJoinOperation.java | 6 +++---
.../sis/feature/builder/AttributeTypeBuilder.java | 8 ++++----
.../sis/feature/builder/FeatureTypeBuilder.java | 2 +-
.../shared}/AttributeConvention.java | 2 +-
.../shared}/FeatureExpression.java | 2 +-
.../shared}/FeatureProjection.java | 6 +++---
.../shared}/FeatureProjectionBuilder.java | 4 ++--
.../{privy => internal/shared}/FeatureView.java | 2 +-
.../{privy => internal/shared}/InstantList.java | 2 +-
.../{privy => internal/shared}/MovingFeatures.java | 4 ++--
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/filter/ArithmeticFunction.java | 6 +++---
.../org/apache/sis/filter/AssociationValue.java | 2 +-
.../apache/sis/filter/BinaryGeometryFilter.java | 2 +-
.../org/apache/sis/filter/ConvertFunction.java | 6 +++---
.../org/apache/sis/filter/IdentifierFilter.java | 2 +-
.../main/org/apache/sis/filter/LeafExpression.java | 4 ++--
.../main/org/apache/sis/filter/LogicalFilter.java | 4 ++--
.../main/org/apache/sis/filter/Optimization.java | 2 +-
.../main/org/apache/sis/filter/PropertyValue.java | 4 ++--
.../main/org/apache/sis/filter/TemporalFilter.java | 2 +-
.../org/apache/sis/filter/TemporalOperation.java | 2 +-
.../sis/filter/internal/GeometryFromFeature.java | 4 ++--
.../main/org/apache/sis/filter/internal/Node.java | 6 +++---
.../{privy => internal/shared}/FunctionNames.java | 2 +-
.../shared}/ListingPropertyVisitor.java | 2 +-
.../shared}/SortByComparator.java | 4 ++--
.../filter/{privy => internal/shared}/Visitor.java | 2 +-
.../{privy => internal/shared}/WarningEvent.java | 2 +-
.../filter/{privy => internal/shared}/XPath.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/filter/sqlmm/FunctionWithSRID.java | 4 ++--
.../main/org/apache/sis/filter/sqlmm/ST_Point.java | 2 +-
.../apache/sis/filter/sqlmm/SpatialFunction.java | 4 ++--
.../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 +-
.../apache/sis/geometry/wrapper/Geometries.java | 4 ++--
.../apache/sis/geometry/wrapper/GeometryType.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../geometry/wrapper/SpatialOperationContext.java | 6 +++---
.../apache/sis/geometry/wrapper/esri/Factory.java | 2 +-
.../sis/geometry/wrapper/j2d/EmptyShape.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Factory.java | 6 +++---
.../apache/sis/geometry/wrapper/j2d/FlatShape.java | 2 +-
.../sis/geometry/wrapper/j2d/MultiPolylines.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeProperties.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Wrapper.java | 4 ++--
.../apache/sis/geometry/wrapper/jts/Factory.java | 2 +-
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +-
.../sis/geometry/wrapper/jts/ShapeAdapter.java | 4 ++--
.../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/image/AnnotatedImage.java | 6 +++---
.../org/apache/sis/image/BandAggregateImage.java | 4 ++--
.../org/apache/sis/image/BandAggregateLayout.java | 12 ++++++------
.../main/org/apache/sis/image/BandSelectImage.java | 8 ++++----
.../main/org/apache/sis/image/BandSharing.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 10 +++++-----
.../main/org/apache/sis/image/Colorizer.java | 10 +++++-----
.../main/org/apache/sis/image/ComputedImage.java | 4 ++--
.../main/org/apache/sis/image/DataType.java | 4 ++--
.../main/org/apache/sis/image/ImageCombiner.java | 4 ++--
.../main/org/apache/sis/image/ImageLayout.java | 4 ++--
.../main/org/apache/sis/image/ImageOverlay.java | 4 ++--
.../main/org/apache/sis/image/ImageProcessor.java | 4 ++--
.../main/org/apache/sis/image/MaskImage.java | 6 +++---
.../main/org/apache/sis/image/MaskedImage.java | 10 +++++-----
.../org/apache/sis/image/MultiSourceImage.java | 2 +-
.../org/apache/sis/image/MultiSourcePrefetch.java | 2 +-
.../main/org/apache/sis/image/PixelIterator.java | 4 ++--
.../main/org/apache/sis/image/PlanarImage.java | 6 +++---
.../sis/image/PositionalConsistencyImage.java | 2 +-
.../main/org/apache/sis/image/PrefetchedImage.java | 8 ++++----
.../main/org/apache/sis/image/RecoloredImage.java | 6 +++---
.../main/org/apache/sis/image/ResampledImage.java | 8 ++++----
.../main/org/apache/sis/image/ResamplingGrid.java | 2 +-
.../org/apache/sis/image/SourceAlignedImage.java | 2 +-
.../org/apache/sis/image/StatisticsCalculator.java | 2 +-
.../main/org/apache/sis/image/TileCache.java | 2 +-
.../main/org/apache/sis/image/Transferer.java | 4 ++--
.../main/org/apache/sis/image/Visualization.java | 8 ++++----
.../apache/sis/image/WritableComputedImage.java | 2 +-
.../shared}/AssertionMessages.java | 2 +-
.../shared}/BatchComputedImage.java | 2 +-
.../shared}/ColorModelBuilder.java | 2 +-
.../shared}/ColorModelFactory.java | 6 +++---
.../{privy => internal/shared}/ColorModelType.java | 2 +-
.../shared}/ColorScaleBuilder.java | 4 ++--
.../{privy => internal/shared}/ColorsForRange.java | 2 +-
.../shared}/DeferredProperty.java | 2 +-
.../{privy => internal/shared}/FillValues.java | 2 +-
.../{privy => internal/shared}/ImageUtilities.java | 6 +++---
.../shared}/MultiBandsIndexColorModel.java | 2 +-
.../shared}/ObservableImage.java | 2 +-
.../{privy => internal/shared}/RasterFactory.java | 2 +-
.../{privy => internal/shared}/ReshapedImage.java | 2 +-
.../shared}/SampleModelBuilder.java | 2 +-
.../shared}/ScaledColorModel.java | 2 +-
.../shared}/ScaledColorSpace.java | 4 ++--
.../shared}/TileErrorHandler.java | 2 +-
.../{privy => internal/shared}/TileOpExecutor.java | 4 ++--
.../shared}/TilePlaceholder.java | 4 ++--
.../{privy => internal/shared}/TiledImage.java | 2 +-
.../shared}/WritableTiledImage.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../sis/image/processing/CompoundFuture.java | 2 +-
.../sis/image/processing/isoline/Fragments.java | 2 +-
.../org/apache/sis/index/tree/NodeIterator.java | 2 +-
.../main/org/apache/sis/index/tree/PointTree.java | 2 +-
.../org/apache/sis/pending/geoapi/filter/Name.java | 2 +-
.../sis/coverage/grid/ClippedGridCoverageTest.java | 2 +-
.../coverage/grid/ConvertedGridCoverageTest.java | 2 +-
.../coverage/grid/DimensionalityReductionTest.java | 2 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +-
.../sis/coverage/grid/GridDerivationTest.java | 4 ++--
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 +-
.../coverage/grid/ResampledGridCoverageTest.java | 8 ++++----
.../coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../shared}/RangeArgumentTest.java | 2 +-
.../apache/sis/feature/EnvelopeOperationTest.java | 2 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 2 +-
.../apache/sis/feature/FeatureOperationsTest.java | 2 +-
.../sis/feature/StringJoinOperationTest.java | 2 +-
.../feature/builder/AttributeTypeBuilderTest.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 2 +-
.../shared}/AttributeConventionTest.java | 2 +-
.../apache/sis/feature/test/FeatureComparator.java | 2 +-
.../org/apache/sis/filter/TemporalFilterTest.java | 2 +-
.../test/org/apache/sis/filter/XPathTest.java | 2 +-
.../shared}/FunctionNamesTest.java | 2 +-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 2 +-
.../apache/sis/image/BandAggregateImageTest.java | 4 ++--
.../org/apache/sis/image/BandSelectImageTest.java | 4 ++--
.../org/apache/sis/image/ImageCombinerTest.java | 2 +-
.../org/apache/sis/image/ImageOverlayTest.java | 2 +-
.../org/apache/sis/image/InterpolationTest.java | 4 ++--
.../test/org/apache/sis/image/MaskedImageTest.java | 2 +-
.../test/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../org/apache/sis/image/ResampledImageTest.java | 4 ++--
.../org/apache/sis/image/ResamplingGridTest.java | 4 ++--
.../apache/sis/image/StatisticsCalculatorTest.java | 2 +-
.../test/org/apache/sis/image/TiledImageMock.java | 4 ++--
.../shared}/ColorModelBuilderTest.java | 2 +-
.../shared}/ImageUtilitiesTest.java | 4 ++--
.../shared}/ReshapedImageTest.java | 2 +-
.../shared}/SampleModelBuilderTest.java | 2 +-
.../shared}/ScaledColorSpaceTest.java | 2 +-
.../sis/image/processing/isoline/IsolinesTest.java | 2 +-
.../sis/image/processing/isoline/StepsViewer.java | 2 +-
...ache.sis.util.internal.shared.MetadataServices} | 0
.../org.apache.sis.metadata/main/module-info.java | 12 ++++++------
.../org/apache/sis/metadata/MetadataStandard.java | 4 ++--
.../org/apache/sis/metadata/MetadataVisitor.java | 2 +-
.../sis/metadata/MetadataVisitorException.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 8 ++++----
.../org/apache/sis/metadata/PropertyAccessor.java | 10 +++++-----
.../main/org/apache/sis/metadata/PropertyMap.java | 2 +-
.../main/org/apache/sis/metadata/Pruner.java | 2 +-
.../main/org/apache/sis/metadata/StateChanger.java | 6 +++---
.../main/org/apache/sis/metadata/TreeNode.java | 4 ++--
.../org/apache/sis/metadata/TreeTableView.java | 4 ++--
.../sis/metadata/internal/CitationConstant.java | 2 +-
.../sis/metadata/internal/ServicesForUtility.java | 8 ++++----
.../{privy => internal/shared}/AxisNames.java | 2 +-
.../{privy => internal/shared}/Identifiers.java | 8 ++++----
.../shared}/ImplementationHelper.java | 8 ++++----
.../{privy => internal/shared}/Merger.java | 4 ++--
.../{privy => internal/shared}/NameMeaning.java | 8 ++++----
.../shared}/NameToIdentifier.java | 2 +-
.../shared}/RecordSchemaSIS.java | 4 ++--
.../shared}/ReferencingServices.java | 4 ++--
.../{privy => internal/shared}/SecondaryTrait.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../iso/DefaultExtendedElementInformation.java | 6 +++---
.../apache/sis/metadata/iso/DefaultMetadata.java | 6 +++---
.../org/apache/sis/metadata/iso/ISOMetadata.java | 6 +++---
.../acquisition/DefaultEnvironmentalRecord.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 8 ++++----
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 4 ++--
.../iso/citation/DefaultResponsibleParty.java | 4 ++--
.../metadata/iso/citation/DefaultTelephone.java | 4 ++--
.../sis/metadata/iso/citation/package-info.java | 2 +-
.../sis/metadata/iso/content/DefaultBand.java | 2 +-
.../iso/content/DefaultCoverageDescription.java | 6 +++---
.../DefaultFeatureCatalogueDescription.java | 4 ++--
.../iso/content/DefaultFeatureTypeInfo.java | 2 +-
.../iso/content/DefaultImageDescription.java | 6 +++---
.../iso/content/DefaultRangeDimension.java | 2 +-
.../iso/content/DefaultSampleDimension.java | 2 +-
.../sis/metadata/iso/content/package-info.java | 2 +-
.../metadata/iso/distribution/DefaultDataFile.java | 2 +-
.../DefaultDigitalTransferOptions.java | 4 ++--
.../metadata/iso/distribution/DefaultFormat.java | 4 ++--
.../metadata/iso/distribution/DefaultMedium.java | 10 +++++-----
.../metadata/iso/distribution/package-info.java | 2 +-
.../sis/metadata/iso/extent/DefaultExtent.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 2 +-
.../iso/extent/DefaultSpatialTemporalExtent.java | 4 ++--
.../metadata/iso/extent/DefaultTemporalExtent.java | 2 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 2 +-
.../apache/sis/metadata/iso/extent/Extents.java | 6 +++---
.../iso/identification/AbstractIdentification.java | 2 +-
.../DefaultAggregateInformation.java | 2 +-
.../iso/identification/DefaultCoupledResource.java | 4 ++--
.../identification/DefaultDataIdentification.java | 2 +-
.../DefaultRepresentativeFraction.java | 6 +++---
.../iso/identification/DefaultResolution.java | 2 +-
.../metadata/iso/identification/DefaultUsage.java | 2 +-
.../metadata/iso/identification/OperationName.java | 2 +-
.../metadata/iso/identification/package-info.java | 2 +-
.../metadata/iso/legacy/LegacyPropertyAdapter.java | 2 +-
.../iso/lineage/DefaultNominalResolution.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 2 +-
.../sis/metadata/iso/lineage/DefaultSource.java | 2 +-
.../sis/metadata/iso/lineage/package-info.java | 2 +-
.../maintenance/DefaultMaintenanceInformation.java | 6 +++---
.../sis/metadata/iso/maintenance/DefaultScope.java | 2 +-
.../sis/metadata/iso/maintenance/package-info.java | 2 +-
.../org/apache/sis/metadata/iso/package-info.java | 2 +-
.../sis/metadata/iso/quality/AbstractElement.java | 2 +-
.../iso/quality/DefaultCoverageResult.java | 2 +-
.../metadata/iso/quality/DefaultDataQuality.java | 2 +-
.../iso/quality/DefaultEvaluationMethod.java | 4 ++--
.../iso/quality/DefaultMeasureReference.java | 2 +-
.../DefaultNonQuantitativeAttributeAccuracy.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../sis/metadata/iso/quality/DefaultUsability.java | 2 +-
.../sis/metadata/iso/quality/package-info.java | 2 +-
.../sis/metadata/iso/spatial/DefaultDimension.java | 2 +-
.../iso/spatial/DefaultGeometricObjects.java | 2 +-
.../spatial/DefaultGridSpatialRepresentation.java | 2 +-
.../apache/sis/metadata/simple/SimpleCitation.java | 2 +-
.../apache/sis/metadata/simple/SimpleExtent.java | 2 +-
.../apache/sis/metadata/simple/SimpleFormat.java | 2 +-
.../metadata/simple/SimpleIdentifiedObject.java | 4 ++--
.../sis/metadata/simple/SimpleIdentifier.java | 2 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 4 ++--
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../org/apache/sis/metadata/sql/Installer.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 16 ++++++++--------
.../apache/sis/metadata/sql/MetadataWriter.java | 8 ++++----
.../sql/{privy => internal/shared}/Dialect.java | 4 ++--
.../{privy => internal/shared}/Initializer.java | 6 +++---
.../shared}/LocalDataSource.java | 4 ++--
.../sql/{privy => internal/shared}/Reflection.java | 2 +-
.../sql/{privy => internal/shared}/SQLBuilder.java | 4 ++--
.../{privy => internal/shared}/SQLUtilities.java | 4 ++--
.../{privy => internal/shared}/ScriptRunner.java | 4 ++--
.../sql/{privy => internal/shared}/Supports.java | 2 +-
.../sql/{privy => internal/shared}/Syntax.java | 4 ++--
.../sql/{privy => internal/shared}/TypeMapper.java | 2 +-
.../{privy => internal/shared}/package-info.java | 4 ++--
.../org/apache/sis/temporal/DefaultPeriod.java | 2 +-
.../org/apache/sis/temporal/GeneralDuration.java | 2 +-
.../org/apache/sis/temporal/LenientDateFormat.java | 2 +-
.../main/org/apache/sis/temporal/TemporalDate.java | 2 +-
.../main/org/apache/sis/temporal/TimeMethods.java | 2 +-
.../org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 2 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 4 ++--
.../org/apache/sis/util/iso/DefaultRecord.java | 6 +++---
.../apache/sis/util/iso/DefaultRecordSchema.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 2 +-
.../org/apache/sis/util/iso/DefaultScopedName.java | 2 +-
.../org/apache/sis/util/iso/RecordDefinition.java | 2 +-
.../main/org/apache/sis/util/iso/TypeNames.java | 2 +-
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../main/org/apache/sis/xml/MarshallerPool.java | 2 +-
.../main/org/apache/sis/xml/Namespaces.java | 4 ++--
.../main/org/apache/sis/xml/NilObjectHandler.java | 2 +-
.../main/org/apache/sis/xml/OutputFactory.java | 2 +-
.../main/org/apache/sis/xml/Pooled.java | 6 +++---
.../main/org/apache/sis/xml/PooledMarshaller.java | 2 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../main/org/apache/sis/xml/ReferenceResolver.java | 8 ++++----
.../main/org/apache/sis/xml/TransformVersion.java | 2 +-
.../org/apache/sis/xml/TransformingReader.java | 14 +++++++-------
.../org/apache/sis/xml/TransformingWriter.java | 4 ++--
.../main/org/apache/sis/xml/ValueConverter.java | 2 +-
.../main/org/apache/sis/xml/XML.java | 2 +-
.../main/org/apache/sis/xml/XPointer.java | 2 +-
.../main/org/apache/sis/xml/bind/Context.java | 6 +++---
.../apache/sis/xml/bind/IdentifierMapAdapter.java | 4 ++--
.../sis/xml/bind/NonMarshalledAuthority.java | 4 ++--
.../apache/sis/xml/bind/SpecializedIdentifier.java | 2 +-
.../apache/sis/xml/bind/cat/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/cat/CodeListUID.java | 4 ++--
.../sis/xml/bind/gco/CharSequenceAdapter.java | 2 +-
.../sis/xml/bind/gco/GO_CharacterString.java | 4 ++--
.../org/apache/sis/xml/bind/gco/GO_DateTime.java | 2 +-
.../org/apache/sis/xml/bind/gco/GO_Temporal.java | 2 +-
.../org/apache/sis/xml/bind/gco/PropertyType.java | 2 +-
.../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 2 +-
.../org/apache/sis/xml/bind/gmi/package-info.java | 2 +-
.../apache/sis/xml/bind/gml/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/DateAdapter.java | 2 +-
.../main/org/apache/sis/xml/bind/gml/Measure.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 2 +-
.../apache/sis/xml/bind/gml/TemporalAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/TimeInstant.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TimePeriod.java | 4 ++--
.../sis/xml/bind/gml/UniversalTimeAdapter.java | 4 ++--
.../org/apache/sis/xml/bind/gts/TM_Duration.java | 2 +-
.../org/apache/sis/xml/bind/gts/package-info.java | 2 +-
.../main/org/apache/sis/xml/bind/lan/Country.java | 4 ++--
.../apache/sis/xml/bind/lan/LocaleAndCharset.java | 6 +++---
.../org/apache/sis/xml/bind/lan/PT_Locale.java | 4 ++--
.../xml/bind/metadata/code/MD_MediumNameCode.java | 2 +-
.../sis/xml/bind/metadata/code/package-info.java | 2 +-
.../sis/xml/bind/metadata/replace/Parameter.java | 2 +-
.../bind/metadata/replace/QualityParameter.java | 2 +-
.../xml/bind/metadata/replace/RS_Identifier.java | 2 +-
.../bind/metadata/replace/ServiceParameter.java | 8 ++++----
.../xml/bind/metadata/replace/package-info.java | 2 +-
.../shared}/ExceptionSimplifier.java | 2 +-
.../shared}/ExternalLinkHandler.java | 4 ++--
.../shared}/LegacyNamespaces.java | 4 ++--
.../shared}/StreamWriterDelegate.java | 2 +-
.../xml/{privy => internal/shared}/URISource.java | 4 ++--
.../{privy => internal/shared}/XmlUtilities.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../shared}/AxisDirectionsTest.md | 0
.../{privy => internal/shared}/AxisNamesTest.java | 2 +-
.../shared}/IdentifiersTest.java | 2 +-
.../shared}/ImplementationHelperTest.java | 2 +-
.../{privy => internal/shared}/MergerTest.java | 2 +-
.../shared}/NameMeaningTest.java | 2 +-
.../sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../metadata/iso/citation/HardCodedCitations.java | 4 ++--
.../constraint/DefaultLegalConstraintsTest.java | 4 ++--
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../iso/quality/DefaultQuantitativeResultTest.java | 4 ++--
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 4 ++--
.../org/apache/sis/metadata/sql/TestDatabase.java | 6 +++---
.../{privy => internal/shared}/SQLBuilderTest.java | 2 +-
.../shared}/SQLUtilitiesTest.java | 2 +-
.../shared}/ScriptRunnerTest.java | 2 +-
.../{privy => internal/shared}/SupportsTest.java | 2 +-
.../{privy => internal/shared}/TypeMapperTest.java | 2 +-
.../apache/sis/test/mock/FeatureAttributeMock.java | 2 +-
.../apache/sis/test/mock/IdentifiedObjectMock.java | 4 ++--
.../org/apache/sis/test/mock/MetadataMock.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 4 ++--
.../test/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../test/org/apache/sis/xml/TransformerTest.java | 2 +-
.../apache/sis/xml/TransformingNamespacesTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 4 ++--
.../shared}/DocumentComparatorTest.java | 2 +-
.../shared}/XmlUtilitiesTest.java | 2 +-
.../sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/xml/test/DocumentComparator.java | 4 ++--
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../org/apache/sis/openoffice/Transformer.java | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 2 +-
.../org/apache/sis/map/coverage/RenderingData.java | 10 +++++-----
.../sis/map/coverage/RenderingWorkaround.java | 2 +-
.../main/org/apache/sis/portrayal/Canvas.java | 8 ++++----
.../org/apache/sis/portrayal/CanvasContext.java | 2 +-
.../org/apache/sis/portrayal/CanvasExtent.java | 4 ++--
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../org/apache/sis/portrayal/PlanarCanvas.java | 2 +-
.../org/apache/sis/style/se1/StyleFactory.java | 2 +-
.../referencing/gazetteer/FinalLocationType.java | 2 +-
.../referencing/gazetteer/GazetteerFactory.java | 2 +-
.../gazetteer/GeohashReferenceSystem.java | 2 +-
.../sis/referencing/gazetteer/LocationFormat.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 6 +++---
.../gazetteer/ModifiableLocationTypeAdapter.java | 2 +-
.../gazetteer/ReferencingByIdentifiers.java | 4 ++--
.../sis/referencing/gazetteer/LocationViewer.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
...s.metadata.internal.shared.ReferencingServices} | 0
...e.sis.metadata.sql.internal.shared.Initializer} | 0
.../main/module-info.java | 6 +++---
.../sis/coordinate/DefaultCoordinateMetadata.java | 4 ++--
.../sis/geometry/AbstractDirectPosition.java | 6 +++---
.../org/apache/sis/geometry/AbstractEnvelope.java | 8 ++++----
.../org/apache/sis/geometry/ArrayEnvelope.java | 2 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 10 +++++-----
.../main/org/apache/sis/geometry/Envelope2D.java | 2 +-
.../org/apache/sis/geometry/EnvelopeReducer.java | 2 +-
.../main/org/apache/sis/geometry/Envelopes.java | 10 +++++-----
.../org/apache/sis/geometry/GeneralEnvelope.java | 4 ++--
.../main/org/apache/sis/geometry/Shapes2D.java | 6 +++---
.../apache/sis/geometry/WraparoundAdjustment.java | 6 +++---
.../apache/sis/geometry/WraparoundInEnvelope.java | 2 +-
.../main/org/apache/sis/io/wkt/Colors.java | 2 +-
.../main/org/apache/sis/io/wkt/Element.java | 4 ++--
.../org/apache/sis/io/wkt/FormattableObject.java | 4 ++--
.../main/org/apache/sis/io/wkt/Formatter.java | 10 +++++-----
.../apache/sis/io/wkt/GeodeticObjectParser.java | 20 ++++++++++----------
.../org/apache/sis/io/wkt/MathTransformParser.java | 8 ++++----
.../main/org/apache/sis/io/wkt/StoredTree.java | 2 +-
.../main/org/apache/sis/io/wkt/Transliterator.java | 6 +++---
.../main/org/apache/sis/io/wkt/VerticalInfo.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTDictionary.java | 10 +++++-----
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../sis/parameter/AbstractParameterDescriptor.java | 4 ++--
.../sis/parameter/DefaultParameterDescriptor.java | 2 +-
.../parameter/DefaultParameterDescriptorGroup.java | 4 ++--
.../sis/parameter/DefaultParameterValue.java | 10 +++++-----
.../sis/parameter/DefaultParameterValueGroup.java | 2 +-
.../apache/sis/parameter/FilteredParameters.java | 2 +-
.../sis/parameter/MapProjectionDescriptor.java | 2 +-
.../sis/parameter/MapProjectionParameters.java | 4 ++--
.../org/apache/sis/parameter/MatrixParameters.java | 2 +-
.../sis/parameter/MatrixParametersAlphaNum.java | 4 ++--
.../org/apache/sis/parameter/ParameterFormat.java | 6 +++---
.../apache/sis/parameter/ParameterTableRow.java | 8 ++++----
.../org/apache/sis/parameter/TensorParameters.java | 2 +-
.../org/apache/sis/parameter/TensorValues.java | 10 +++++-----
.../sis/parameter/UninitializedParameter.java | 2 +-
.../sis/parameter/UnmodifiableParameterValue.java | 2 +-
.../parameter/UnmodifiableParameterValueGroup.java | 2 +-
.../main/org/apache/sis/parameter/Verifier.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 22 +++++++++++-----------
.../apache/sis/referencing/AuthorityFactories.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 12 ++++++------
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++---
.../sis/referencing/DefaultObjectDomain.java | 2 +-
.../sis/referencing/EPSGFactoryFallback.java | 6 +++---
.../referencing/EllipsoidalHeightSeparator.java | 10 +++++-----
.../sis/referencing/GeodesicsOnEllipsoid.java | 2 +-
.../apache/sis/referencing/GeodeticCalculator.java | 12 ++++++------
.../apache/sis/referencing/IdentifiedObjects.java | 14 +++++++-------
.../sis/referencing/ImmutableIdentifier.java | 8 ++++----
.../org/apache/sis/referencing/NameIterator.java | 8 ++++----
.../apache/sis/referencing/NamedIdentifier.java | 2 +-
.../org/apache/sis/referencing/Properties.java | 4 ++--
.../sis/referencing/StandardDefinitions.java | 8 ++++----
.../apache/sis/referencing/crs/AbstractCRS.java | 6 +++---
.../sis/referencing/crs/AbstractDerivedCRS.java | 6 +++---
.../sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultDerivedCRS.java | 6 +++---
.../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultGeographicCRS.java | 10 +++++-----
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultTemporalCRS.java | 6 +++---
.../sis/referencing/crs/DefaultVerticalCRS.java | 2 +-
.../org/apache/sis/referencing/crs/DynamicCRS.java | 2 +-
.../sis/referencing/crs/ExplicitParameters.java | 6 +++---
.../org/apache/sis/referencing/cs/AbstractCS.java | 12 ++++++------
.../apache/sis/referencing/cs/AxesConvention.java | 2 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 4 ++--
.../sis/referencing/cs/CoordinateSystems.java | 6 +++---
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 4 ++--
.../cs/DefaultCoordinateSystemAxis.java | 12 ++++++------
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 6 +++---
.../org/apache/sis/referencing/cs/Normalizer.java | 6 +++---
.../org/apache/sis/referencing/cs/SubTypes.java | 2 +-
.../sis/referencing/datum/AbstractDatum.java | 18 +++++++++---------
.../sis/referencing/datum/BursaWolfParameters.java | 4 ++--
.../sis/referencing/datum/DatumOrEnsemble.java | 2 +-
.../sis/referencing/datum/DatumShiftGrid.java | 4 ++--
.../referencing/datum/DefaultDatumEnsemble.java | 10 +++++-----
.../sis/referencing/datum/DefaultEllipsoid.java | 12 ++++++------
.../referencing/datum/DefaultEngineeringDatum.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 12 ++++++------
.../sis/referencing/datum/DefaultImageDatum.java | 4 ++--
.../referencing/datum/DefaultParametricDatum.java | 2 +-
.../referencing/datum/DefaultPrimeMeridian.java | 14 +++++++-------
.../referencing/datum/DefaultTemporalDatum.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 6 +++---
.../sis/referencing/datum/TimeDependentBWP.java | 4 ++--
.../apache/sis/referencing/datum/package-info.java | 2 +-
.../factory/AuthorityFactoryIdentifier.java | 10 +++++-----
.../referencing/factory/AuthorityFactoryProxy.java | 2 +-
.../referencing/factory/CommonAuthorityCode.java | 4 ++--
.../factory/CommonAuthorityFactory.java | 4 ++--
.../factory/ConcurrentAuthorityFactory.java | 4 ++--
.../sis/referencing/factory/FilteredCodes.java | 2 +-
.../factory/GeodeticAuthorityFactory.java | 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../factory/IdentifiedObjectFinder.java | 6 +++---
.../factory/LazySynchronizedIterator.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 14 +++++++-------
.../sis/referencing/factory/ReferenceKeeper.java | 2 +-
.../referencing/factory/sql/AuthorityCodes.java | 6 +++---
.../referencing/factory/sql/EPSGCodeFinder.java | 14 +++++++-------
.../referencing/factory/sql/EPSGDataAccess.java | 14 +++++++-------
.../sis/referencing/factory/sql/EPSGFactory.java | 6 +++---
.../sis/referencing/factory/sql/EPSGInstaller.java | 6 +++---
.../factory/sql/InstallationScriptProvider.java | 2 +-
.../referencing/factory/sql/ObjectPertinence.java | 6 +++---
.../sis/referencing/factory/sql/SQLTranslator.java | 6 +++---
.../sis/referencing/factory/sql/TableInfo.java | 2 +-
.../sis/referencing/internal/AnnotatedMatrix.java | 2 +-
.../sis/referencing/internal/Arithmetic.java | 6 +++---
.../sis/referencing/internal/DatabaseListener.java | 4 ++--
.../referencing/internal/EPSGParameterDomain.java | 2 +-
.../org/apache/sis/referencing/internal/Epoch.java | 2 +-
.../apache/sis/referencing/internal/Legacy.java | 2 +-
.../sis/referencing/internal/MergedProperties.java | 2 +-
.../referencing/internal/ParameterizedAffine.java | 2 +-
.../internal/ParameterizedTransformBuilder.java | 8 ++++----
.../internal/PositionalAccuracyConstant.java | 2 +-
.../referencing/internal/ServicesForMetadata.java | 10 +++++-----
.../referencing/internal/VerticalDatumTypes.java | 2 +-
.../{privy => internal/shared}/AbstractShape.java | 2 +-
.../{privy => internal/shared}/AffineMatrix.java | 4 ++--
.../shared}/AffineTransform2D.java | 2 +-
.../{privy => internal/shared}/AxesMapper.java | 4 ++--
.../{privy => internal/shared}/AxisDirections.java | 6 +++---
.../shared}/CoordinateOperations.java | 10 +++++-----
.../shared}/DefinitionVerifier.java | 2 +-
.../shared}/DirectPositionView.java | 2 +-
.../shared}/EllipsoidalHeightCombiner.java | 2 +-
.../shared}/ExtendedPrecisionMatrix.java | 2 +-
.../{privy => internal/shared}/ExtentSelector.java | 4 ++--
.../shared}/FilteredIterator.java | 2 +-
.../{privy => internal/shared}/Formulas.java | 12 ++++++------
.../shared}/GeodeticObjectBuilder.java | 2 +-
.../shared}/IntervalRectangle.java | 4 ++--
.../{privy => internal/shared}/LazySet.java | 4 ++--
.../shared}/NilReferencingObject.java | 2 +-
.../shared}/ReferencingFactoryContainer.java | 4 ++--
.../shared}/ReferencingUtilities.java | 6 +++---
.../{privy => internal/shared}/ShapeUtilities.java | 2 +-
.../shared}/TemporalAccessor.java | 2 +-
.../{privy => internal/shared}/WKTKeywords.java | 2 +-
.../{privy => internal/shared}/WKTUtilities.java | 6 +++---
.../shared}/WraparoundApplicator.java | 4 ++--
.../shared}/WraparoundAxesFinder.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 18 +++++++++---------
.../operation/AbstractSingleOperation.java | 6 +++---
.../apache/sis/referencing/operation/CRSPair.java | 4 ++--
.../operation/CoordinateOperationContext.java | 4 ++--
.../operation/CoordinateOperationFinder.java | 12 ++++++------
.../operation/CoordinateOperationRegistry.java | 6 +++---
.../operation/DefaultConcatenatedOperation.java | 10 +++++-----
.../referencing/operation/DefaultConversion.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 6 +++---
.../sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/DefaultOperationMethod.java | 10 +++++-----
.../operation/DefaultPassThroughOperation.java | 4 ++--
.../operation/InverseOperationMethod.java | 2 +-
.../operation/MathTransformContext.java | 8 ++++----
.../operation/builder/LinearTransformBuilder.java | 10 +++++-----
.../operation/builder/LocalizationGridBuilder.java | 4 ++--
.../operation/builder/ResidualGrid.java | 6 +++---
.../operation/gridded/CompressedGrid.java | 2 +-
.../referencing/operation/gridded/GridGroup.java | 6 +++---
.../referencing/operation/gridded/LoadedGrid.java | 2 +-
.../sis/referencing/operation/gridded/Tile.java | 2 +-
.../operation/gridded/TileOrganizer.java | 2 +-
.../operation/matrix/AffineTransforms2D.java | 4 ++--
.../operation/matrix/GeneralMatrix.java | 4 ++--
.../sis/referencing/operation/matrix/Matrices.java | 8 ++++----
.../sis/referencing/operation/matrix/Matrix1.java | 2 +-
.../sis/referencing/operation/matrix/Matrix2.java | 2 +-
.../referencing/operation/matrix/MatrixSIS.java | 4 ++--
.../sis/referencing/operation/matrix/Solver.java | 2 +-
.../operation/matrix/UnmodifiableMatrix.java | 2 +-
.../operation/projection/AlbersEqualArea.java | 4 ++--
.../operation/projection/AuthalicConversion.java | 2 +-
.../operation/projection/ConformalProjection.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 2 +-
.../projection/EquidistantCylindrical.java | 2 +-
.../operation/projection/Initializer.java | 6 +++---
.../projection/LambertAzimuthalEqualArea.java | 4 ++--
.../projection/LambertConicConformal.java | 6 +++---
.../operation/projection/LongitudeWraparound.java | 4 ++--
.../referencing/operation/projection/Mercator.java | 2 +-
.../operation/projection/MeridianArcBased.java | 2 +-
.../operation/projection/NormalizedProjection.java | 6 +++---
.../operation/projection/ObliqueMercator.java | 2 +-
.../operation/projection/ObliqueStereographic.java | 4 ++--
.../operation/projection/PolarStereographic.java | 6 +++---
.../referencing/operation/projection/Robinson.java | 2 +-
.../operation/projection/SatelliteTracking.java | 2 +-
.../operation/projection/TransverseMercator.java | 2 +-
.../operation/projection/ZonedGridSystem.java | 2 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../sis/referencing/operation/provider/Affine.java | 4 ++--
.../referencing/operation/provider/EPSGName.java | 2 +-
.../operation/provider/Equirectangular.java | 4 ++--
.../provider/FranceGeocentricInterpolation.java | 2 +-
.../operation/provider/GeocentricAffine.java | 6 +++---
.../GeocentricAffineBetweenGeographic.java | 2 +-
.../operation/provider/Geographic2Dto3D.java | 2 +-
.../operation/provider/Geographic3Dto2D.java | 4 ++--
.../operation/provider/GeographicOffsets2D.java | 2 +-
.../operation/provider/Interpolation1D.java | 2 +-
.../operation/provider/LambertConformal2SP.java | 2 +-
.../operation/provider/LongitudeRotation.java | 2 +-
.../operation/provider/MapProjection.java | 2 +-
.../operation/provider/Mercator1SP.java | 2 +-
.../provider/MercatorAuxiliarySphere.java | 2 +-
.../operation/provider/MillerCylindrical.java | 2 +-
.../referencing/operation/provider/Mollweide.java | 2 +-
.../referencing/operation/provider/Molodensky.java | 6 +++---
.../sis/referencing/operation/provider/NTv2.java | 4 ++--
.../operation/provider/NorthPoleRotation.java | 2 +-
.../provider/ObliqueMercatorTwoPoints.java | 2 +-
.../operation/provider/PolarStereographicA.java | 6 +++---
.../referencing/operation/provider/Robinson.java | 2 +-
.../operation/provider/SatelliteTracking.java | 2 +-
.../operation/provider/SouthPoleRotation.java | 2 +-
.../operation/provider/Spherical2Dto3D.java | 2 +-
.../operation/provider/Spherical3Dto2D.java | 2 +-
.../operation/provider/TransverseMercator.java | 6 +++---
.../transform/AbstractLinearTransform.java | 4 ++--
.../operation/transform/AbstractMathTransform.java | 4 ++--
.../transform/AbstractMathTransform2D.java | 2 +-
.../operation/transform/CartesianToPolar.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 4 ++--
.../operation/transform/ContextualParameters.java | 14 +++++++-------
.../transform/CoordinateSystemTransform.java | 6 +++---
.../CoordinateSystemTransformBuilder.java | 4 ++--
.../transform/DefaultMathTransformFactory.java | 6 +++---
.../transform/EllipsoidToCentricTransform.java | 12 ++++++------
.../transform/EllipsoidToRadiusTransform.java | 10 +++++-----
.../transform/ExponentialTransform1D.java | 2 +-
.../operation/transform/IdentityTransform.java | 2 +-
.../transform/InterpolatedGeocentricTransform.java | 2 +-
.../operation/transform/InterpolatedTransform.java | 4 ++--
.../operation/transform/LinearInterpolator1D.java | 2 +-
.../operation/transform/LinearTransform1D.java | 8 ++++----
.../transform/LogarithmicTransform1D.java | 2 +-
.../operation/transform/MathTransformBuilder.java | 2 +-
.../operation/transform/MathTransforms.java | 6 +++---
.../operation/transform/MolodenskyTransform.java | 2 +-
.../operation/transform/OperationMethodSet.java | 2 +-
.../operation/transform/PassThroughTransform.java | 6 +++---
.../operation/transform/PolarToCartesian.java | 2 +-
.../operation/transform/PoleRotation.java | 6 +++---
.../operation/transform/PowerTransform1D.java | 2 +-
.../operation/transform/ProjectiveTransform.java | 10 +++++-----
.../operation/transform/ProjectiveTransform2D.java | 2 +-
.../operation/transform/ScaleTransform.java | 4 ++--
.../transform/SpecializableTransform.java | 2 +-
.../operation/transform/TransformJoiner.java | 2 +-
.../operation/transform/TransformSeparator.java | 4 ++--
.../operation/transform/TranslationTransform.java | 4 ++--
.../operation/transform/WraparoundTransform.java | 2 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../bind/referencing/CC_CoordinateOperation.java | 2 +-
.../referencing/CC_GeneralOperationParameter.java | 2 +-
.../sis/xml/bind/referencing/CS_AxisDirection.java | 2 +-
.../sis/xml/bind/referencing/CS_RangeMeaning.java | 2 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 8 ++++----
.../org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/TransformTestCase.java | 4 ++--
.../sis/geometry/WraparoundAdjustmentTest.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 6 +++---
.../org/apache/sis/io/wkt/TransliteratorTest.java | 4 ++--
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../sis/parameter/MapProjectionParametersTest.java | 18 +++++++++---------
.../apache/sis/parameter/TensorParametersTest.java | 4 ++--
.../org/apache/sis/parameter/TensorValuesTest.java | 6 +++---
.../org/apache/sis/referencing/Assertions.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 2 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 6 +++---
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 4 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 6 +++---
.../sis/referencing/GeodeticObjectVerifier.java | 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 4 ++--
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 ++--
.../referencing/crs/DefaultTemporalCRSTest.java | 4 ++--
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 ++--
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../sis/referencing/datum/GeodeticDatumMock.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 2 +-
.../referencing/datum/TimeDependentBWPTest.java | 2 +-
.../factory/CommonAuthorityFactoryTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 ++--
.../referencing/factory/sql/EPSGInstallerTest.java | 4 ++--
.../factory/sql/EPSGScriptProvider.java | 2 +-
.../apache/sis/referencing/internal/EpochTest.java | 2 +-
.../shared}/AbstractShapeTest.java | 2 +-
.../{privy => internal/shared}/AxesMapperTest.java | 2 +-
.../shared}/AxisDirectionsTest.java | 12 ++++++------
.../shared}/CoordinateOperationsTest.java | 2 +-
.../shared}/DefinitionVerifierTest.java | 2 +-
.../shared}/EllipsoidalHeightCombinerTest.java | 2 +-
.../shared}/ExtentSelectorTest.java | 2 +-
.../{privy => internal/shared}/FormulasTest.java | 4 ++--
.../shared}/GeodeticObjectBuilderTest.java | 2 +-
.../{privy => internal/shared}/LazySetTest.java | 2 +-
.../shared}/ReferencingUtilitiesTest.java | 4 ++--
.../shared}/ShapeUtilitiesExt.java | 2 +-
.../shared}/ShapeUtilitiesTest.java | 2 +-
.../shared}/ShapeUtilitiesViewer.java | 2 +-
.../shared}/WKTKeywordsTest.java | 2 +-
.../shared}/WKTUtilitiesTest.java | 4 ++--
.../shared}/WraparoundApplicatorTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 6 +++---
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../operation/DefaultConversionTest.java | 4 ++--
.../DefaultCoordinateOperationFactoryTest.java | 4 ++--
.../operation/DefaultTransformationTest.java | 2 +-
.../operation/HardCodedConversions.java | 2 +-
.../operation/matrix/GeneralMatrixTest.java | 2 +-
.../referencing/operation/matrix/MatricesTest.java | 2 +-
.../operation/matrix/MatrixTestCase.java | 4 ++--
.../operation/projection/AlbersEqualAreaTest.java | 2 +-
.../projection/AuthalicConversionTest.java | 2 +-
.../projection/AzimuthalEquidistantTest.java | 2 +-
.../operation/projection/CassiniSoldnerTest.java | 2 +-
.../projection/ConformalProjectionTest.java | 2 +-
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../projection/EquidistantCylindricalTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 4 ++--
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 6 +++---
.../projection/LambertConicConformalTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 4 ++--
.../projection/MercatorMethodComparison.java | 4 ++--
.../operation/projection/MercatorTest.java | 4 ++--
.../operation/projection/MollweideTest.java | 2 +-
.../sis/referencing/operation/projection/NoOp.java | 2 +-
.../projection/NormalizedProjectionTest.java | 2 +-
.../projection/ObliqueStereographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/PolyconicTest.java | 2 +-
.../operation/projection/ProjectionBenchmark.java | 2 +-
.../projection/ProjectionResultComparator.java | 2 +-
.../operation/projection/RobinsonTest.java | 2 +-
.../projection/SatelliteTrackingTest.java | 2 +-
.../operation/projection/SinusoidalTest.java | 2 +-
.../projection/TransverseMercatorTest.java | 2 +-
.../operation/projection/ZonedGridSystemTest.java | 4 ++--
.../provider/CoordinateFrameRotationTest.java | 2 +-
.../provider/GeocentricTranslationTest.java | 4 ++--
.../operation/provider/Geographic3Dto2DTest.java | 2 +-
.../operation/provider/GeographicOffsetsTest.java | 2 +-
.../operation/provider/MapProjectionTest.java | 2 +-
.../referencing/operation/provider/NTv2Test.java | 2 +-
.../provider/PositionVector7ParamTest.java | 2 +-
.../operation/provider/ProvidersTest.java | 2 +-
.../operation/provider/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../transform/ConcatenatedTransformTest.java | 2 +-
.../operation/transform/CoordinateDomain.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 4 ++--
.../operation/transform/DomainDefinitionTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 2 +-
.../operation/transform/LinearTransformTest.java | 2 +-
.../transform/MolodenskyTransformTest.java | 4 ++--
.../transform/OperationMethodSetTest.java | 2 +-
.../operation/transform/PoleRotationTest.java | 2 +-
.../transform/ProjectiveTransformTest.java | 6 +++---
.../operation/transform/ScaleTransformTest.java | 2 +-
.../transform/SpecializableTransformTest.java | 2 +-
.../transform/TranslationTransformTest.java | 4 ++--
.../transform/WraparoundTransformTest.java | 2 +-
.../report/CoordinateOperationMethods.java | 4 ++--
.../sis/referencing/report/HTMLGenerator.java | 2 +-
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 2 +-
.../org/apache/sis/test/widget/package-info.java | 2 +-
.../CC_OperationParameterGroupTest.java | 2 +-
.../apache/sis/xml/bind/referencing/CodeTest.java | 2 +-
.../main/org/apache/sis/storage/landsat/Band.java | 2 +-
.../org/apache/sis/storage/landsat/BandGroup.java | 2 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/storage/landsat/MetadataReader.java | 12 ++++++------
.../sis/storage/geotiff/CompressedSubset.java | 2 +-
.../apache/sis/storage/geotiff/Compression.java | 2 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 8 ++++----
.../apache/sis/storage/geotiff/GeoTiffStore.java | 4 ++--
.../sis/storage/geotiff/GeoTiffStoreProvider.java | 2 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 12 ++++++------
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../org/apache/sis/storage/geotiff/Writer.java | 2 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 14 +++++++-------
.../geotiff/reader/GridGeometryBuilder.java | 2 +-
.../apache/sis/storage/geotiff/reader/Type.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 10 +++++-----
.../storage/geotiff/writer/ReformattedImage.java | 4 ++--
.../org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../storage/geotiff/reader/XMLMetadataTest.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 10 +++++-----
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 6 +++---
.../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/AxisType.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSMerger.java | 4 ++--
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../apache/sis/storage/netcdf/base/Decoder.java | 4 ++--
.../apache/sis/storage/netcdf/base/FeatureSet.java | 4 ++--
.../org/apache/sis/storage/netcdf/base/Grid.java | 2 +-
.../sis/storage/netcdf/base/GridCacheKey.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 10 +++++-----
.../apache/sis/storage/netcdf/base/Linearizer.java | 6 +++---
.../sis/storage/netcdf/base/NamedElement.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Node.java | 2 +-
.../sis/storage/netcdf/base/RasterResource.java | 8 ++++----
.../apache/sis/storage/netcdf/base/Variable.java | 6 +++---
.../storage/netcdf/base/VariableTransformer.java | 2 +-
.../sis/storage/netcdf/classic/ChannelDecoder.java | 4 ++--
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 2 +-
.../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/DimensionWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/GridWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/VariableWrapper.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../org/apache/sis/storage/sql/duckdb/DuckDB.java | 2 +-
.../apache/sis/storage/sql/feature/Analyzer.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Column.java | 6 +++---
.../apache/sis/storage/sql/feature/Database.java | 12 ++++++------
.../sis/storage/sql/feature/FeatureAdapter.java | 2 +-
.../sis/storage/sql/feature/FeatureIterator.java | 4 ++--
.../sis/storage/sql/feature/FeatureStream.java | 10 +++++-----
.../sis/storage/sql/feature/InfoStatements.java | 10 +++++-----
.../apache/sis/storage/sql/feature/PrimaryKey.java | 4 ++--
.../sis/storage/sql/feature/QueryAnalyzer.java | 4 ++--
.../apache/sis/storage/sql/feature/Relation.java | 4 ++--
.../sis/storage/sql/feature/SelectionClause.java | 4 ++--
.../storage/sql/feature/SelectionClauseWriter.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Table.java | 8 ++++----
.../sis/storage/sql/feature/TableAnalyzer.java | 4 ++--
.../sis/storage/sql/feature/TableReference.java | 2 +-
.../sis/storage/sql/feature/ValueGetter.java | 4 ++--
.../sis/storage/sql/postgis/ExtentEstimator.java | 2 +-
.../apache/sis/storage/sql/postgis/Postgres.java | 2 +-
.../sis/storage/sql/postgis/RasterReader.java | 10 +++++-----
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../storage/sql/feature/InfoStatementsTest.java | 2 +-
.../sql/feature/TemporalValueGetterTest.java | 2 +-
.../sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../apache/sis/storage/sql/postgis/TestRaster.java | 2 +-
.../main/org/apache/sis/storage/gpx/Metadata.java | 2 +-
.../main/org/apache/sis/storage/gpx/Reader.java | 2 +-
.../main/org/apache/sis/storage/gpx/Types.java | 2 +-
.../main/org/apache/sis/storage/gpx/Writer.java | 2 +-
.../sis/storage/xml/stream/FormattedWriter.java | 2 +-
.../sis/storage/xml/stream/NamespaceEraser.java | 2 +-
.../sis/storage/xml/stream/StaxDataStore.java | 6 +++---
.../sis/storage/xml/stream/StaxStreamReader.java | 2 +-
.../test/org/apache/sis/storage/gpx/TypesTest.java | 2 +-
.../apache/sis/io/stream/ChannelDataOutput.java | 2 +-
.../apache/sis/io/stream/FileCacheByteChannel.java | 2 +-
.../main/org/apache/sis/io/stream/IOUtilities.java | 2 +-
.../sis/storage/AbstractGridCoverageResource.java | 2 +-
.../org/apache/sis/storage/CoverageSubset.java | 6 +++---
.../main/org/apache/sis/storage/DataStore.java | 2 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 4 ++--
.../main/org/apache/sis/storage/FeatureNaming.java | 2 +-
.../main/org/apache/sis/storage/FeatureQuery.java | 12 ++++++------
.../main/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../main/org/apache/sis/storage/ProbeResult.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 4 ++--
.../sis/storage/aggregate/AggregatedResource.java | 2 +-
.../aggregate/BandAggregateGridResource.java | 6 +++---
.../storage/aggregate/ConcatenatedFeatureSet.java | 4 ++--
.../aggregate/ConcatenatedGridCoverage.java | 4 ++--
.../aggregate/ConcatenatedGridResource.java | 4 ++--
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../sis/storage/aggregate/DimensionSelector.java | 2 +-
.../apache/sis/storage/aggregate/GridSlice.java | 6 +++---
.../org/apache/sis/storage/aggregate/Group.java | 2 +-
.../sis/storage/aggregate/GroupAggregate.java | 2 +-
.../sis/storage/aggregate/GroupByTransform.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 2 +-
.../sis/storage/aggregate/MergeStrategy.java | 4 ++--
.../main/org/apache/sis/storage/base/CodeType.java | 4 ++--
.../apache/sis/storage/base/MetadataBuilder.java | 10 +++++-----
.../org/apache/sis/storage/base/PRJDataStore.java | 2 +-
.../apache/sis/storage/base/ResourceLineage.java | 4 ++--
.../apache/sis/storage/base/SimpleAggregate.java | 2 +-
.../apache/sis/storage/base/StoreUtilities.java | 2 +-
.../sis/storage/base/TiledDeferredImage.java | 2 +-
.../apache/sis/storage/base/TiledGridCoverage.java | 6 +++---
.../apache/sis/storage/base/TiledGridResource.java | 8 ++++----
.../org/apache/sis/storage/base/URIDataStore.java | 4 ++--
.../sis/storage/csv/MovingFeatureBuilder.java | 4 ++--
.../main/org/apache/sis/storage/csv/Store.java | 6 +++---
.../apache/sis/storage/esri/AsciiGridStore.java | 2 +-
.../org/apache/sis/storage/esri/RasterStore.java | 12 ++++++------
.../apache/sis/storage/esri/RawRasterReader.java | 8 ++++----
.../apache/sis/storage/esri/RawRasterStore.java | 6 +++---
.../apache/sis/storage/event/StoreListeners.java | 2 +-
.../main/org/apache/sis/storage/folder/Store.java | 2 +-
.../sis/storage/image/WorldFileResource.java | 6 +++---
.../apache/sis/storage/image/WorldFileStore.java | 4 ++--
.../sis/storage/modifier/CoverageModifier.java | 2 +-
.../main/org/apache/sis/storage/tiling/Tile.java | 2 +-
.../org/apache/sis/storage/wkt/StoreFormat.java | 2 +-
.../org/apache/sis/storage/wkt/StoreProvider.java | 2 +-
.../main/org/apache/sis/storage/xml/Store.java | 4 ++--
.../org/apache/sis/storage/xml/StoreProvider.java | 2 +-
.../org/apache/sis/storage/CoverageQueryTest.java | 2 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 2 +-
.../sis/storage/aggregate/CoverageMosaicTest.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSetTest.java | 2 +-
.../sis/storage/base/MemoryGridResourceTest.java | 2 +-
.../sis/storage/test/CoverageReadConsistency.java | 4 ++--
.../apache/sis/storage/test/SubsampledImage.java | 2 +-
.../sis/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../test/org/apache/sis/storage/xml/StoreTest.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 4 ++--
.../org/apache/sis/converter/StringConverter.java | 4 ++--
.../main/org/apache/sis/io/CompoundFormat.java | 6 +++---
.../main/org/apache/sis/io/DefaultFormat.java | 2 +-
.../org/apache/sis/io/IdentifiedObjectFormat.java | 6 +++---
.../main/org/apache/sis/io/LineAppender.java | 2 +-
.../main/org/apache/sis/io/TableAppender.java | 2 +-
.../main/org/apache/sis/math/ArrayVector.java | 2 +-
.../main/org/apache/sis/math/DecimalFunctions.java | 2 +-
.../main/org/apache/sis/math/Fraction.java | 2 +-
.../main/org/apache/sis/math/Line.java | 6 +++---
.../org/apache/sis/math/LinearlyDerivedVector.java | 2 +-
.../main/org/apache/sis/math/MathFunctions.java | 6 +++---
.../main/org/apache/sis/math/Plane.java | 6 +++---
.../main/org/apache/sis/math/Statistics.java | 4 ++--
.../main/org/apache/sis/math/StatisticsFormat.java | 2 +-
.../main/org/apache/sis/math/Vector.java | 2 +-
.../main/org/apache/sis/measure/AbstractUnit.java | 2 +-
.../main/org/apache/sis/measure/Angle.java | 2 +-
.../main/org/apache/sis/measure/AngleFormat.java | 4 ++--
.../org/apache/sis/measure/LinearConverter.java | 4 ++--
.../main/org/apache/sis/measure/NumberRange.java | 2 +-
.../main/org/apache/sis/measure/Prefixes.java | 2 +-
.../main/org/apache/sis/measure/Range.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
.../main/org/apache/sis/measure/Scalar.java | 2 +-
.../apache/sis/measure/SexagesimalConverter.java | 2 +-
.../main/org/apache/sis/measure/UnitDimension.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 6 +++---
.../main/org/apache/sis/measure/UnitRegistry.java | 2 +-
.../main/org/apache/sis/measure/UnitServices.java | 2 +-
.../main/org/apache/sis/measure/Units.java | 6 +++---
.../main/org/apache/sis/setup/About.java | 6 +++---
.../main/org/apache/sis/setup/Configuration.java | 2 +-
.../main/org/apache/sis/setup/GeometryLibrary.java | 2 +-
.../apache/sis/setup/InstallationResources.java | 6 +++---
.../apache/sis/setup/OptionalInstallations.java | 2 +-
.../main/org/apache/sis/system/DataDirectory.java | 2 +-
.../sis/util/AbstractInternationalString.java | 2 +-
.../main/org/apache/sis/util/ArgumentChecks.java | 2 +-
.../main/org/apache/sis/util/Characters.java | 4 ++--
.../main/org/apache/sis/util/Numbers.java | 4 ++--
.../apache/sis/util/collection/CodeListSet.java | 4 ++--
.../org/apache/sis/util/collection/Containers.java | 2 +-
.../sis/util/collection/DefaultTreeTable.java | 4 ++--
.../org/apache/sis/util/collection/DerivedSet.java | 2 +-
.../apache/sis/util/collection/IntegerList.java | 2 +-
.../sis/util/collection/TreeTableFormat.java | 6 +++---
.../sis/util/internal/AutoMessageFormat.java | 2 +-
.../shared}/AbstractIterator.java | 2 +-
.../{privy => internal/shared}/AbstractMap.java | 2 +-
.../shared}/AbstractMapEntry.java | 2 +-
.../sis/util/{privy => internal/shared}/Bag.java | 2 +-
.../shared}/CheckedArrayList.java | 2 +-
.../{privy => internal/shared}/CheckedHashSet.java | 2 +-
.../{privy => internal/shared}/CloneAccess.java | 2 +-
.../util/{privy => internal/shared}/Cloner.java | 2 +-
.../util/{privy => internal/shared}/CodeLists.java | 2 +-
.../{privy => internal/shared}/CollectionsExt.java | 2 +-
.../util/{privy => internal/shared}/Constants.java | 2 +-
.../{privy => internal/shared}/DefinitionURI.java | 8 ++++----
.../{privy => internal/shared}/DoubleDouble.java | 2 +-
.../{privy => internal/shared}/EmptyQueue.java | 2 +-
.../{privy => internal/shared}/LazyCandidate.java | 2 +-
.../shared}/ListOfUnknownSize.java | 2 +-
.../shared}/LocalizedParseException.java | 2 +-
.../shared}/MetadataServices.java | 2 +-
.../util/{privy => internal/shared}/Numerics.java | 6 +++---
.../{privy => internal/shared}/PropertyFormat.java | 2 +-
.../shared}/SetOfUnknownSize.java | 2 +-
.../util/{privy => internal/shared}/Strings.java | 2 +-
.../shared}/TreeFormatCustomization.java | 2 +-
.../sis/util/{privy => internal/shared}/URLs.java | 2 +-
.../shared}/UnmodifiableArrayList.java | 2 +-
.../util/{privy => internal/shared}/Unsafe.java | 2 +-
.../sis/util/{privy => internal/shared}/X364.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/util/logging/MonolineFormatter.java | 6 +++---
.../sis/util/resources/IndexedResourceBundle.java | 4 ++--
.../test/org/apache/sis/io/WordWrapTest.java | 2 +-
.../org/apache/sis/measure/RangeFormatTest.java | 2 +-
.../test/org/apache/sis/test/TestCase.java | 2 +-
.../test/org/apache/sis/test/TestUtilities.java | 4 ++--
.../org/apache/sis/util/collection/CacheTest.java | 2 +-
.../apache/sis/util/collection/RangeSetTest.java | 4 ++--
.../shared}/AbstractMapTest.java | 2 +-
.../util/{privy => internal/shared}/BagTest.java | 2 +-
.../shared}/CheckedArrayListTest.java | 2 +-
.../shared}/CollectionsExtTest.java | 2 +-
.../{privy => internal/shared}/ConstantsTest.java | 2 +-
.../shared}/DefinitionURITest.java | 2 +-
.../shared}/DoubleDoubleTest.java | 2 +-
.../shared}/ListOfUnknownSizeTest.java | 2 +-
.../shared}/LocalizedParseExceptionTest.java | 2 +-
.../{privy => internal/shared}/NumericsTest.java | 4 ++--
.../{privy => internal/shared}/StringsTest.java | 2 +-
.../util/{privy => internal/shared}/X364Test.java | 4 ++--
.../sis/util/logging/MonolineFormatterTest.java | 2 +-
.../sis/storage/geoheif/CoverageBuilder.java | 10 +++++-----
.../apache/sis/storage/geoheif/GeoHeifStore.java | 2 +-
.../main/org/apache/sis/storage/geoheif/Group.java | 2 +-
.../sis/storage/geoheif/UncompressedImage.java | 4 ++--
.../org/apache/sis/storage/isobmff/TreeNode.java | 2 +-
.../apache/sis/storage/isobmff/base/HeaderBox.java | 2 +-
.../sis/storage/isobmff/mpeg/ComponentPalette.java | 2 +-
.../org/apache/sis/storage/geopackage/Content.java | 2 +-
.../sis/storage/geopackage/ContentWriter.java | 2 +-
.../apache/sis/storage/geopackage/GpkgStore.java | 2 +-
.../sis/storage/geopackage/GpkgStoreProvider.java | 4 ++--
.../sis/storage/shapefile/ShapefileStore.java | 6 +++---
.../sis/storage/shapefile/ShapefileStoreTest.java | 2 +-
netbeans-project/nbproject/project.properties | 8 ++++----
optional/build.gradle.kts | 2 +-
.../apache/sis/gui/controls/SyncWindowList.java | 2 +-
.../apache/sis/gui/controls/ValueColorMapper.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 4 ++--
.../main/org/apache/sis/gui/coverage/GridView.java | 2 +-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 4 ++--
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 4 ++--
.../org/apache/sis/gui/dataset/ResourceCell.java | 2 +-
.../apache/sis/gui/internal/DataStoreOpener.java | 2 +-
.../org/apache/sis/gui/internal/GUIUtilities.java | 2 +-
.../apache/sis/gui/internal/ImageConverter.java | 6 +++---
.../sis/gui/internal/PropertyValueFormats.java | 2 +-
.../sis/gui/internal/PropertyValueFormatter.java | 2 +-
.../apache/sis/gui/internal/io/FileAccessItem.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 8 ++++----
.../main/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
.../sis/gui/metadata/IdentificationInfo.java | 4 ++--
.../apache/sis/gui/metadata/MetadataSummary.java | 2 +-
.../sis/gui/metadata/RepresentationInfo.java | 2 +-
.../sis/gui/metadata/StandardMetadataTree.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 4 ++--
.../org/apache/sis/gui/referencing/CRSChooser.java | 2 +-
.../org/apache/sis/gui/referencing/CodeFilter.java | 2 +-
.../org/apache/sis/gui/referencing/MenuSync.java | 2 +-
.../gui/referencing/PositionableProjection.java | 4 ++--
.../gui/referencing/RecentReferenceSystems.java | 4 ++--
.../main/org/apache/sis/gui/referencing/Utils.java | 2 +-
.../sis/resources/embedded/EmbeddedResources.java | 4 ++--
.../resources/embedded/EmbeddedResourcesTest.java | 2 +-
.../apache/sis/resources/embedded/Generator.java | 4 ++--
.../factory/sql/epsg/ScriptProvider.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java | 6 +++---
.../main/org/apache/sis/storage/gdal/Band.java | 4 ++--
.../main/org/apache/sis/storage/gdal/Driver.java | 4 ++--
.../apache/sis/storage/gdal/FeatureIterator.java | 4 ++--
.../org/apache/sis/storage/gdal/FeatureLayer.java | 4 ++--
.../org/apache/sis/storage/gdal/FieldAccessor.java | 4 ++--
.../main/org/apache/sis/storage/gdal/GDAL.java | 2 +-
.../org/apache/sis/storage/gdal/GDALStore.java | 4 ++--
.../apache/sis/storage/gdal/GDALStoreProvider.java | 2 +-
.../main/org/apache/sis/storage/gdal/Opener.java | 2 +-
.../org/apache/sis/storage/gdal/SpatialRef.java | 2 +-
.../org/apache/sis/storage/gdal/TiledCoverage.java | 2 +-
.../org/apache/sis/storage/gdal/TiledResource.java | 8 ++++----
.../org/apache/sis/storage/gdal/GDALStoreTest.java | 2 +-
1152 files changed, 2076 insertions(+), 2076 deletions(-)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/{privy => internal/shared}/BandAggregateArgument.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/{privy => internal/shared}/CommonDomainFinder.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/{privy => internal/shared}/RangeArgument.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/{privy => internal/shared}/SampleDimensions.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/AttributeConvention.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/FeatureExpression.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/FeatureProjection.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/FeatureProjectionBuilder.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/FeatureView.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/InstantList.java (97%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/MovingFeatures.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/FunctionNames.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/ListingPropertyVisitor.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/SortByComparator.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/Visitor.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/WarningEvent.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/XPath.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/AssertionMessages.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/BatchComputedImage.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelBuilder.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelFactory.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorModelType.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorScaleBuilder.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ColorsForRange.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/DeferredProperty.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/FillValues.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ImageUtilities.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/MultiBandsIndexColorModel.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ObservableImage.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/RasterFactory.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ReshapedImage.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/SampleModelBuilder.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ScaledColorModel.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/ScaledColorSpace.java (98%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TileErrorHandler.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TileOpExecutor.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TilePlaceholder.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/TiledImage.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/WritableTiledImage.java (99%)
rename endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/{privy => internal/shared}/RangeArgumentTest.java (98%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/{privy => internal/shared}/AttributeConventionTest.java (99%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/{privy => internal/shared}/FunctionNamesTest.java (97%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ColorModelBuilderTest.java (99%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ImageUtilitiesTest.java (98%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ReshapedImageTest.java (99%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/SampleModelBuilderTest.java (99%)
rename endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/{privy => internal/shared}/ScaledColorSpaceTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/META-INF/services/{org.apache.sis.util.privy.MetadataServices => org.apache.sis.util.internal.shared.MetadataServices} (100%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/AxisNames.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/Identifiers.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/ImplementationHelper.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/Merger.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/NameMeaning.java (97%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/NameToIdentifier.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/RecordSchemaSIS.java (97%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/ReferencingServices.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/SecondaryTrait.java (97%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Dialect.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Initializer.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/LocalDataSource.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Reflection.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLBuilder.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLUtilities.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/ScriptRunner.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Supports.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/Syntax.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/TypeMapper.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/{privy => internal/shared}/package-info.java (95%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/ExceptionSimplifier.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/ExternalLinkHandler.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/LegacyNamespaces.java (97%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/StreamWriterDelegate.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/URISource.java (98%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/XmlUtilities.java (99%)
rename endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/AxisDirectionsTest.md (100%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/AxisNamesTest.java (97%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/IdentifiersTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/ImplementationHelperTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/MergerTest.java (99%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/{privy => internal/shared}/NameMeaningTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLBuilderTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SQLUtilitiesTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/ScriptRunnerTest.java (98%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/SupportsTest.java (97%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/{privy => internal/shared}/TypeMapperTest.java (96%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/{privy => internal/shared}/DocumentComparatorTest.java (99%)
rename endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/{privy => internal/shared}/XmlUtilitiesTest.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/META-INF/services/{org.apache.sis.metadata.privy.ReferencingServices => org.apache.sis.metadata.internal.shared.ReferencingServices} (100%)
rename endorsed/src/org.apache.sis.referencing/main/META-INF/services/{org.apache.sis.metadata.sql.privy.Initializer => org.apache.sis.metadata.sql.internal.shared.Initializer} (100%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/AbstractShape.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/AffineMatrix.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/AffineTransform2D.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/AxesMapper.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/AxisDirections.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/CoordinateOperations.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/DefinitionVerifier.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/DirectPositionView.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/EllipsoidalHeightCombiner.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/ExtendedPrecisionMatrix.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/ExtentSelector.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/FilteredIterator.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/Formulas.java (97%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/GeodeticObjectBuilder.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/IntervalRectangle.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/LazySet.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/NilReferencingObject.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/ReferencingFactoryContainer.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/ReferencingUtilities.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/ShapeUtilities.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/TemporalAccessor.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/WKTKeywords.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/WKTUtilities.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/WraparoundApplicator.java (99%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/WraparoundAxesFinder.java (98%)
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/{privy => internal/shared}/package-info.java (96%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/AbstractShapeTest.java (96%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/AxesMapperTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/AxisDirectionsTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/CoordinateOperationsTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/DefinitionVerifierTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/EllipsoidalHeightCombinerTest.java (99%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/ExtentSelectorTest.java (99%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/FormulasTest.java (97%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/GeodeticObjectBuilderTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/LazySetTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/ReferencingUtilitiesTest.java (97%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/ShapeUtilitiesExt.java (99%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/ShapeUtilitiesTest.java (99%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/ShapeUtilitiesViewer.java (99%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/WKTKeywordsTest.java (98%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/WKTUtilitiesTest.java (97%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/{privy => internal/shared}/WraparoundApplicatorTest.java (96%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/AbstractIterator.java (97%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/AbstractMap.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/AbstractMapEntry.java (98%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Bag.java (98%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/CheckedArrayList.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/CheckedHashSet.java (98%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/CloneAccess.java (97%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Cloner.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/CodeLists.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/CollectionsExt.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Constants.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/DefinitionURI.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/DoubleDouble.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/EmptyQueue.java (98%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/LazyCandidate.java (97%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/ListOfUnknownSize.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/LocalizedParseException.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/MetadataServices.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Numerics.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/PropertyFormat.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/SetOfUnknownSize.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Strings.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/TreeFormatCustomization.java (98%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/URLs.java (97%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/UnmodifiableArrayList.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/Unsafe.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/X364.java (99%)
rename endorsed/src/org.apache.sis.util/main/org/apache/sis/util/{privy => internal/shared}/package-info.java (97%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/AbstractMapTest.java (99%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/BagTest.java (98%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/CheckedArrayListTest.java (99%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/CollectionsExtTest.java (99%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/ConstantsTest.java (97%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/DefinitionURITest.java (99%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/DoubleDoubleTest.java (99%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/ListOfUnknownSizeTest.java (97%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/LocalizedParseExceptionTest.java (98%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/NumericsTest.java (98%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/StringsTest.java (97%)
rename endorsed/src/org.apache.sis.util/test/org/apache/sis/util/{privy => internal/shared}/X364Test.java (95%)
(sis) 01/01: Merge branch 'geoapi-3.1': renaming of the "privy" internal package.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit f4d97c35d89905d99ba19fc80455498c75884499
Merge: eaee561ab0 5b57d58d6b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Sep 23 17:20:16 2025 +0200
Merge branch 'geoapi-3.1': renaming of the "privy" internal package.
endorsed/build.gradle.kts | 6 +++---
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 2 +-
.../main/org/apache/sis/console/AboutCommand.java | 4 ++--
.../main/org/apache/sis/console/Command.java | 2 +-
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../apache/sis/console/FormattedOutputCommand.java | 2 +-
.../org/apache/sis/console/IdentifierCommand.java | 2 +-
.../apache/sis/console/ResourcesDownloader.java | 2 +-
.../org/apache/sis/console/TransformCommand.java | 8 ++++----
.../org.apache.sis.feature/main/module-info.java | 8 ++++----
.../org/apache/sis/coverage/CoverageCombiner.java | 6 +++---
.../org/apache/sis/coverage/SampleDimension.java | 2 +-
.../org/apache/sis/coverage/SampleRangeFormat.java | 2 +-
.../coverage/grid/BandAggregateGridCoverage.java | 4 ++--
.../sis/coverage/grid/ClippedGridCoverage.java | 2 +-
.../coverage/grid/CoordinateOperationFinder.java | 6 +++---
.../apache/sis/coverage/grid/DefaultEvaluator.java | 8 ++++----
.../sis/coverage/grid/DimensionAppender.java | 2 +-
.../apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../sis/coverage/grid/DimensionalityReduction.java | 2 +-
.../coverage/grid/FractionalGridCoordinates.java | 2 +-
.../org/apache/sis/coverage/grid/GridCoverage.java | 4 ++--
.../apache/sis/coverage/grid/GridCoverage2D.java | 6 +++---
.../sis/coverage/grid/GridCoverageBuilder.java | 8 ++++----
.../sis/coverage/grid/GridCoverageProcessor.java | 8 ++++----
.../apache/sis/coverage/grid/GridDerivation.java | 2 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 10 +++++-----
.../apache/sis/coverage/grid/GridExtentCRS.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 14 +++++++-------
.../apache/sis/coverage/grid/ImageRenderer.java | 12 ++++++------
.../sis/coverage/grid/ReducedGridCoverage.java | 2 +-
.../sis/coverage/grid/ResampledGridCoverage.java | 6 +++---
.../apache/sis/coverage/grid/SliceGeometry.java | 8 ++++----
.../shared}/BandAggregateArgument.java | 4 ++--
.../shared}/CommonDomainFinder.java | 6 +++---
.../{privy => internal/shared}/RangeArgument.java | 8 ++++----
.../shared}/SampleDimensions.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/feature/AbstractFeature.java | 2 +-
.../org/apache/sis/feature/CharacteristicMap.java | 8 ++++----
.../apache/sis/feature/CharacteristicTypeMap.java | 4 ++--
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 4 ++--
.../main/org/apache/sis/feature/DenseFeature.java | 4 ++--
.../org/apache/sis/feature/EnvelopeOperation.java | 4 ++--
.../apache/sis/feature/ExpressionOperation.java | 4 ++--
.../main/org/apache/sis/feature/FeatureFormat.java | 4 ++--
.../org/apache/sis/feature/FeatureOperations.java | 4 ++--
.../sis/feature/GroupAsPolylineOperation.java | 4 ++--
.../apache/sis/feature/MultiValuedAssociation.java | 2 +-
.../apache/sis/feature/MultiValuedAttribute.java | 4 ++--
.../org/apache/sis/feature/NamedFeatureType.java | 2 +-
.../org/apache/sis/feature/SingletonAttribute.java | 2 +-
.../main/org/apache/sis/feature/SparseFeature.java | 4 ++--
.../apache/sis/feature/StringJoinOperation.java | 6 +++---
.../sis/feature/builder/AttributeTypeBuilder.java | 8 ++++----
.../sis/feature/builder/FeatureTypeBuilder.java | 2 +-
.../shared}/AttributeConvention.java | 2 +-
.../shared}/FeatureExpression.java | 2 +-
.../shared}/FeatureProjection.java | 6 +++---
.../shared}/FeatureProjectionBuilder.java | 4 ++--
.../{privy => internal/shared}/FeatureView.java | 2 +-
.../{privy => internal/shared}/InstantList.java | 2 +-
.../{privy => internal/shared}/MovingFeatures.java | 4 ++--
.../{privy => internal/shared}/package-info.java | 2 +-
.../org/apache/sis/filter/ArithmeticFunction.java | 6 +++---
.../org/apache/sis/filter/AssociationValue.java | 2 +-
.../apache/sis/filter/BinaryGeometryFilter.java | 2 +-
.../org/apache/sis/filter/ConvertFunction.java | 6 +++---
.../org/apache/sis/filter/IdentifierFilter.java | 2 +-
.../main/org/apache/sis/filter/LeafExpression.java | 4 ++--
.../main/org/apache/sis/filter/LogicalFilter.java | 4 ++--
.../main/org/apache/sis/filter/Optimization.java | 2 +-
.../main/org/apache/sis/filter/PropertyValue.java | 4 ++--
.../main/org/apache/sis/filter/TemporalFilter.java | 2 +-
.../org/apache/sis/filter/TemporalOperation.java | 2 +-
.../sis/filter/internal/GeometryFromFeature.java | 4 ++--
.../main/org/apache/sis/filter/internal/Node.java | 6 +++---
.../{privy => internal/shared}/FunctionNames.java | 2 +-
.../shared}/ListingPropertyVisitor.java | 2 +-
.../shared}/SortByComparator.java | 4 ++--
.../filter/{privy => internal/shared}/Visitor.java | 2 +-
.../{privy => internal/shared}/WarningEvent.java | 2 +-
.../filter/{privy => internal/shared}/XPath.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/filter/sqlmm/FunctionWithSRID.java | 4 ++--
.../main/org/apache/sis/filter/sqlmm/ST_Point.java | 2 +-
.../apache/sis/filter/sqlmm/SpatialFunction.java | 4 ++--
.../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 +-
.../apache/sis/geometry/wrapper/Geometries.java | 4 ++--
.../apache/sis/geometry/wrapper/GeometryType.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../geometry/wrapper/SpatialOperationContext.java | 6 +++---
.../apache/sis/geometry/wrapper/esri/Factory.java | 2 +-
.../sis/geometry/wrapper/j2d/EmptyShape.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Factory.java | 6 +++---
.../apache/sis/geometry/wrapper/j2d/FlatShape.java | 2 +-
.../sis/geometry/wrapper/j2d/MultiPolylines.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeProperties.java | 2 +-
.../sis/geometry/wrapper/j2d/ShapeWrapper.java | 2 +-
.../apache/sis/geometry/wrapper/j2d/Wrapper.java | 4 ++--
.../apache/sis/geometry/wrapper/jts/Factory.java | 2 +-
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +-
.../sis/geometry/wrapper/jts/ShapeAdapter.java | 4 ++--
.../sis/geometry/wrapper/jts/ShapeConverter.java | 2 +-
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../main/org/apache/sis/image/AnnotatedImage.java | 6 +++---
.../org/apache/sis/image/BandAggregateImage.java | 4 ++--
.../org/apache/sis/image/BandAggregateLayout.java | 12 ++++++------
.../main/org/apache/sis/image/BandSelectImage.java | 8 ++++----
.../main/org/apache/sis/image/BandSharing.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 10 +++++-----
.../main/org/apache/sis/image/Colorizer.java | 10 +++++-----
.../main/org/apache/sis/image/ComputedImage.java | 4 ++--
.../main/org/apache/sis/image/DataType.java | 4 ++--
.../main/org/apache/sis/image/ImageCombiner.java | 4 ++--
.../main/org/apache/sis/image/ImageLayout.java | 4 ++--
.../main/org/apache/sis/image/ImageOverlay.java | 4 ++--
.../main/org/apache/sis/image/ImageProcessor.java | 4 ++--
.../main/org/apache/sis/image/MaskImage.java | 6 +++---
.../main/org/apache/sis/image/MaskedImage.java | 10 +++++-----
.../org/apache/sis/image/MultiSourceImage.java | 2 +-
.../org/apache/sis/image/MultiSourcePrefetch.java | 2 +-
.../main/org/apache/sis/image/PixelIterator.java | 4 ++--
.../main/org/apache/sis/image/PlanarImage.java | 6 +++---
.../sis/image/PositionalConsistencyImage.java | 2 +-
.../main/org/apache/sis/image/PrefetchedImage.java | 8 ++++----
.../main/org/apache/sis/image/RecoloredImage.java | 6 +++---
.../main/org/apache/sis/image/ResampledImage.java | 8 ++++----
.../main/org/apache/sis/image/ResamplingGrid.java | 2 +-
.../org/apache/sis/image/SourceAlignedImage.java | 2 +-
.../org/apache/sis/image/StatisticsCalculator.java | 2 +-
.../main/org/apache/sis/image/TileCache.java | 2 +-
.../main/org/apache/sis/image/Transferer.java | 4 ++--
.../main/org/apache/sis/image/Visualization.java | 8 ++++----
.../apache/sis/image/WritableComputedImage.java | 2 +-
.../shared}/AssertionMessages.java | 2 +-
.../shared}/BatchComputedImage.java | 2 +-
.../shared}/ColorModelBuilder.java | 2 +-
.../shared}/ColorModelFactory.java | 6 +++---
.../{privy => internal/shared}/ColorModelType.java | 2 +-
.../shared}/ColorScaleBuilder.java | 4 ++--
.../{privy => internal/shared}/ColorsForRange.java | 2 +-
.../shared}/DeferredProperty.java | 2 +-
.../{privy => internal/shared}/FillValues.java | 2 +-
.../{privy => internal/shared}/ImageUtilities.java | 6 +++---
.../shared}/MultiBandsIndexColorModel.java | 2 +-
.../shared}/ObservableImage.java | 2 +-
.../{privy => internal/shared}/RasterFactory.java | 2 +-
.../{privy => internal/shared}/ReshapedImage.java | 2 +-
.../shared}/SampleModelBuilder.java | 2 +-
.../shared}/ScaledColorModel.java | 2 +-
.../shared}/ScaledColorSpace.java | 4 ++--
.../shared}/TileErrorHandler.java | 2 +-
.../{privy => internal/shared}/TileOpExecutor.java | 4 ++--
.../shared}/TilePlaceholder.java | 4 ++--
.../{privy => internal/shared}/TiledImage.java | 2 +-
.../shared}/WritableTiledImage.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../sis/image/processing/CompoundFuture.java | 2 +-
.../sis/image/processing/isoline/Fragments.java | 2 +-
.../org/apache/sis/index/tree/NodeIterator.java | 2 +-
.../main/org/apache/sis/index/tree/PointTree.java | 2 +-
.../org/apache/sis/pending/geoapi/filter/Name.java | 2 +-
.../sis/coverage/grid/ClippedGridCoverageTest.java | 2 +-
.../coverage/grid/ConvertedGridCoverageTest.java | 2 +-
.../coverage/grid/DimensionalityReductionTest.java | 2 +-
.../sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilderTest.java | 2 +-
.../sis/coverage/grid/GridDerivationTest.java | 4 ++--
.../apache/sis/coverage/grid/GridGeometryTest.java | 2 +-
.../coverage/grid/ResampledGridCoverageTest.java | 8 ++++----
.../coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../shared}/RangeArgumentTest.java | 2 +-
.../apache/sis/feature/EnvelopeOperationTest.java | 2 +-
.../apache/sis/feature/FeatureMemoryBenchmark.java | 2 +-
.../apache/sis/feature/FeatureOperationsTest.java | 2 +-
.../sis/feature/StringJoinOperationTest.java | 2 +-
.../feature/builder/AttributeTypeBuilderTest.java | 2 +-
.../feature/builder/FeatureTypeBuilderTest.java | 2 +-
.../shared}/AttributeConventionTest.java | 2 +-
.../apache/sis/feature/test/FeatureComparator.java | 2 +-
.../org/apache/sis/filter/TemporalFilterTest.java | 2 +-
.../test/org/apache/sis/filter/XPathTest.java | 2 +-
.../shared}/FunctionNamesTest.java | 2 +-
.../apache/sis/geometry/wrapper/jts/JTSTest.java | 2 +-
.../apache/sis/image/BandAggregateImageTest.java | 4 ++--
.../org/apache/sis/image/BandSelectImageTest.java | 4 ++--
.../org/apache/sis/image/ImageCombinerTest.java | 2 +-
.../org/apache/sis/image/ImageOverlayTest.java | 2 +-
.../org/apache/sis/image/InterpolationTest.java | 4 ++--
.../test/org/apache/sis/image/MaskedImageTest.java | 2 +-
.../test/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../org/apache/sis/image/ResampledImageTest.java | 4 ++--
.../org/apache/sis/image/ResamplingGridTest.java | 4 ++--
.../apache/sis/image/StatisticsCalculatorTest.java | 2 +-
.../test/org/apache/sis/image/TiledImageMock.java | 4 ++--
.../shared}/ColorModelBuilderTest.java | 2 +-
.../shared}/ImageUtilitiesTest.java | 4 ++--
.../shared}/ReshapedImageTest.java | 2 +-
.../shared}/SampleModelBuilderTest.java | 2 +-
.../shared}/ScaledColorSpaceTest.java | 2 +-
.../sis/image/processing/isoline/IsolinesTest.java | 2 +-
.../sis/image/processing/isoline/StepsViewer.java | 2 +-
...ache.sis.util.internal.shared.MetadataServices} | 0
.../org.apache.sis.metadata/main/module-info.java | 12 ++++++------
.../org/apache/sis/metadata/MetadataStandard.java | 4 ++--
.../org/apache/sis/metadata/MetadataVisitor.java | 2 +-
.../sis/metadata/MetadataVisitorException.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 8 ++++----
.../org/apache/sis/metadata/PropertyAccessor.java | 10 +++++-----
.../main/org/apache/sis/metadata/PropertyMap.java | 2 +-
.../main/org/apache/sis/metadata/Pruner.java | 2 +-
.../main/org/apache/sis/metadata/StateChanger.java | 6 +++---
.../main/org/apache/sis/metadata/TreeNode.java | 4 ++--
.../org/apache/sis/metadata/TreeTableView.java | 4 ++--
.../sis/metadata/internal/CitationConstant.java | 2 +-
.../sis/metadata/internal/ServicesForUtility.java | 8 ++++----
.../{privy => internal/shared}/AxisNames.java | 2 +-
.../{privy => internal/shared}/Identifiers.java | 8 ++++----
.../shared}/ImplementationHelper.java | 8 ++++----
.../{privy => internal/shared}/Merger.java | 4 ++--
.../{privy => internal/shared}/NameMeaning.java | 8 ++++----
.../shared}/NameToIdentifier.java | 2 +-
.../shared}/RecordSchemaSIS.java | 4 ++--
.../shared}/ReferencingServices.java | 4 ++--
.../{privy => internal/shared}/SecondaryTrait.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../iso/DefaultExtendedElementInformation.java | 6 +++---
.../apache/sis/metadata/iso/DefaultMetadata.java | 6 +++---
.../org/apache/sis/metadata/iso/ISOMetadata.java | 6 +++---
.../acquisition/DefaultEnvironmentalRecord.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 8 ++++----
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 4 ++--
.../iso/citation/DefaultResponsibleParty.java | 4 ++--
.../metadata/iso/citation/DefaultTelephone.java | 4 ++--
.../sis/metadata/iso/citation/package-info.java | 2 +-
.../sis/metadata/iso/content/DefaultBand.java | 2 +-
.../iso/content/DefaultCoverageDescription.java | 6 +++---
.../DefaultFeatureCatalogueDescription.java | 4 ++--
.../iso/content/DefaultFeatureTypeInfo.java | 2 +-
.../iso/content/DefaultImageDescription.java | 6 +++---
.../iso/content/DefaultRangeDimension.java | 2 +-
.../iso/content/DefaultSampleDimension.java | 2 +-
.../sis/metadata/iso/content/package-info.java | 2 +-
.../metadata/iso/distribution/DefaultDataFile.java | 2 +-
.../DefaultDigitalTransferOptions.java | 4 ++--
.../metadata/iso/distribution/DefaultFormat.java | 4 ++--
.../metadata/iso/distribution/DefaultMedium.java | 10 +++++-----
.../metadata/iso/distribution/package-info.java | 2 +-
.../sis/metadata/iso/extent/DefaultExtent.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 2 +-
.../iso/extent/DefaultSpatialTemporalExtent.java | 4 ++--
.../metadata/iso/extent/DefaultTemporalExtent.java | 2 +-
.../metadata/iso/extent/DefaultVerticalExtent.java | 2 +-
.../apache/sis/metadata/iso/extent/Extents.java | 6 +++---
.../iso/identification/AbstractIdentification.java | 2 +-
.../DefaultAggregateInformation.java | 2 +-
.../iso/identification/DefaultCoupledResource.java | 4 ++--
.../identification/DefaultDataIdentification.java | 2 +-
.../DefaultRepresentativeFraction.java | 6 +++---
.../iso/identification/DefaultResolution.java | 2 +-
.../metadata/iso/identification/DefaultUsage.java | 2 +-
.../metadata/iso/identification/OperationName.java | 2 +-
.../metadata/iso/identification/package-info.java | 2 +-
.../metadata/iso/legacy/LegacyPropertyAdapter.java | 2 +-
.../iso/lineage/DefaultNominalResolution.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 2 +-
.../sis/metadata/iso/lineage/DefaultSource.java | 2 +-
.../sis/metadata/iso/lineage/package-info.java | 2 +-
.../maintenance/DefaultMaintenanceInformation.java | 6 +++---
.../sis/metadata/iso/maintenance/DefaultScope.java | 2 +-
.../sis/metadata/iso/maintenance/package-info.java | 2 +-
.../org/apache/sis/metadata/iso/package-info.java | 2 +-
.../sis/metadata/iso/quality/AbstractElement.java | 2 +-
.../iso/quality/DefaultCoverageResult.java | 2 +-
.../metadata/iso/quality/DefaultDataQuality.java | 2 +-
.../iso/quality/DefaultEvaluationMethod.java | 4 ++--
.../iso/quality/DefaultMeasureReference.java | 2 +-
.../DefaultNonQuantitativeAttributeAccuracy.java | 2 +-
.../iso/quality/DefaultQuantitativeResult.java | 2 +-
.../sis/metadata/iso/quality/DefaultUsability.java | 2 +-
.../sis/metadata/iso/quality/package-info.java | 2 +-
.../sis/metadata/iso/spatial/DefaultDimension.java | 2 +-
.../iso/spatial/DefaultGeometricObjects.java | 2 +-
.../spatial/DefaultGridSpatialRepresentation.java | 2 +-
.../apache/sis/metadata/simple/SimpleCitation.java | 2 +-
.../apache/sis/metadata/simple/SimpleExtent.java | 2 +-
.../apache/sis/metadata/simple/SimpleFormat.java | 2 +-
.../metadata/simple/SimpleIdentifiedObject.java | 4 ++--
.../sis/metadata/simple/SimpleIdentifier.java | 2 +-
.../org/apache/sis/metadata/sql/Dispatcher.java | 4 ++--
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../org/apache/sis/metadata/sql/Installer.java | 2 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 16 ++++++++--------
.../apache/sis/metadata/sql/MetadataWriter.java | 8 ++++----
.../sql/{privy => internal/shared}/Dialect.java | 4 ++--
.../{privy => internal/shared}/Initializer.java | 6 +++---
.../shared}/LocalDataSource.java | 4 ++--
.../sql/{privy => internal/shared}/Reflection.java | 2 +-
.../sql/{privy => internal/shared}/SQLBuilder.java | 4 ++--
.../{privy => internal/shared}/SQLUtilities.java | 4 ++--
.../{privy => internal/shared}/ScriptRunner.java | 4 ++--
.../sql/{privy => internal/shared}/Supports.java | 2 +-
.../sql/{privy => internal/shared}/Syntax.java | 4 ++--
.../sql/{privy => internal/shared}/TypeMapper.java | 2 +-
.../{privy => internal/shared}/package-info.java | 4 ++--
.../org/apache/sis/temporal/DefaultPeriod.java | 2 +-
.../org/apache/sis/temporal/GeneralDuration.java | 2 +-
.../org/apache/sis/temporal/LenientDateFormat.java | 2 +-
.../main/org/apache/sis/temporal/TemporalDate.java | 2 +-
.../main/org/apache/sis/temporal/TimeMethods.java | 2 +-
.../org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 2 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 4 ++--
.../org/apache/sis/util/iso/DefaultRecord.java | 6 +++---
.../apache/sis/util/iso/DefaultRecordSchema.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 2 +-
.../org/apache/sis/util/iso/DefaultScopedName.java | 2 +-
.../org/apache/sis/util/iso/RecordDefinition.java | 2 +-
.../main/org/apache/sis/util/iso/TypeNames.java | 2 +-
.../main/org/apache/sis/util/iso/Types.java | 4 ++--
.../main/org/apache/sis/xml/MarshallerPool.java | 2 +-
.../main/org/apache/sis/xml/Namespaces.java | 4 ++--
.../main/org/apache/sis/xml/NilObjectHandler.java | 2 +-
.../main/org/apache/sis/xml/OutputFactory.java | 2 +-
.../main/org/apache/sis/xml/Pooled.java | 6 +++---
.../main/org/apache/sis/xml/PooledMarshaller.java | 2 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../main/org/apache/sis/xml/ReferenceResolver.java | 8 ++++----
.../main/org/apache/sis/xml/TransformVersion.java | 2 +-
.../org/apache/sis/xml/TransformingReader.java | 14 +++++++-------
.../org/apache/sis/xml/TransformingWriter.java | 4 ++--
.../main/org/apache/sis/xml/ValueConverter.java | 2 +-
.../main/org/apache/sis/xml/XML.java | 2 +-
.../main/org/apache/sis/xml/XPointer.java | 2 +-
.../main/org/apache/sis/xml/bind/Context.java | 6 +++---
.../apache/sis/xml/bind/IdentifierMapAdapter.java | 4 ++--
.../sis/xml/bind/NonMarshalledAuthority.java | 4 ++--
.../apache/sis/xml/bind/SpecializedIdentifier.java | 2 +-
.../apache/sis/xml/bind/cat/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/cat/CodeListUID.java | 4 ++--
.../sis/xml/bind/gco/CharSequenceAdapter.java | 2 +-
.../sis/xml/bind/gco/GO_CharacterString.java | 4 ++--
.../org/apache/sis/xml/bind/gco/GO_DateTime.java | 2 +-
.../org/apache/sis/xml/bind/gco/GO_Temporal.java | 2 +-
.../org/apache/sis/xml/bind/gco/PropertyType.java | 2 +-
.../org/apache/sis/xml/bind/gmi/MI_Metadata.java | 2 +-
.../org/apache/sis/xml/bind/gmi/package-info.java | 2 +-
.../apache/sis/xml/bind/gml/CodeListAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/DateAdapter.java | 2 +-
.../main/org/apache/sis/xml/bind/gml/Measure.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TM_Primitive.java | 2 +-
.../apache/sis/xml/bind/gml/TemporalAdapter.java | 2 +-
.../org/apache/sis/xml/bind/gml/TimeInstant.java | 4 ++--
.../org/apache/sis/xml/bind/gml/TimePeriod.java | 4 ++--
.../sis/xml/bind/gml/UniversalTimeAdapter.java | 4 ++--
.../org/apache/sis/xml/bind/gts/TM_Duration.java | 2 +-
.../org/apache/sis/xml/bind/gts/package-info.java | 2 +-
.../main/org/apache/sis/xml/bind/lan/Country.java | 4 ++--
.../apache/sis/xml/bind/lan/LocaleAndCharset.java | 6 +++---
.../org/apache/sis/xml/bind/lan/PT_Locale.java | 4 ++--
.../xml/bind/metadata/code/MD_MediumNameCode.java | 2 +-
.../sis/xml/bind/metadata/code/package-info.java | 2 +-
.../sis/xml/bind/metadata/replace/Parameter.java | 2 +-
.../bind/metadata/replace/QualityParameter.java | 2 +-
.../xml/bind/metadata/replace/RS_Identifier.java | 2 +-
.../bind/metadata/replace/ServiceParameter.java | 8 ++++----
.../xml/bind/metadata/replace/package-info.java | 2 +-
.../shared}/ExceptionSimplifier.java | 2 +-
.../shared}/ExternalLinkHandler.java | 4 ++--
.../shared}/LegacyNamespaces.java | 4 ++--
.../shared}/StreamWriterDelegate.java | 2 +-
.../xml/{privy => internal/shared}/URISource.java | 4 ++--
.../{privy => internal/shared}/XmlUtilities.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../shared}/AxisDirectionsTest.md | 0
.../{privy => internal/shared}/AxisNamesTest.java | 2 +-
.../shared}/IdentifiersTest.java | 2 +-
.../shared}/ImplementationHelperTest.java | 2 +-
.../{privy => internal/shared}/MergerTest.java | 2 +-
.../shared}/NameMeaningTest.java | 2 +-
.../sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../metadata/iso/citation/HardCodedCitations.java | 4 ++--
.../constraint/DefaultLegalConstraintsTest.java | 4 ++--
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../sis/metadata/iso/extent/ExtentsTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../iso/quality/DefaultQuantitativeResultTest.java | 4 ++--
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 4 ++--
.../org/apache/sis/metadata/sql/TestDatabase.java | 6 +++---
.../{privy => internal/shared}/SQLBuilderTest.java | 2 +-
.../shared}/SQLUtilitiesTest.java | 2 +-
.../shared}/ScriptRunnerTest.java | 2 +-
.../{privy => internal/shared}/SupportsTest.java | 2 +-
.../{privy => internal/shared}/TypeMapperTest.java | 2 +-
.../apache/sis/test/mock/FeatureAttributeMock.java | 2 +-
.../apache/sis/test/mock/IdentifiedObjectMock.java | 4 ++--
.../org/apache/sis/test/mock/MetadataMock.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../apache/sis/util/iso/DefaultLocalNameTest.java | 2 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 4 ++--
.../test/org/apache/sis/xml/NamespacesTest.java | 2 +-
.../test/org/apache/sis/xml/TransformerTest.java | 2 +-
.../apache/sis/xml/TransformingNamespacesTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 4 ++--
.../shared}/DocumentComparatorTest.java | 2 +-
.../shared}/XmlUtilitiesTest.java | 2 +-
.../sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../apache/sis/xml/test/DocumentComparator.java | 4 ++--
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../org/apache/sis/openoffice/Transformer.java | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 2 +-
.../org/apache/sis/map/coverage/RenderingData.java | 10 +++++-----
.../sis/map/coverage/RenderingWorkaround.java | 2 +-
.../main/org/apache/sis/portrayal/Canvas.java | 8 ++++----
.../org/apache/sis/portrayal/CanvasContext.java | 2 +-
.../org/apache/sis/portrayal/CanvasExtent.java | 4 ++--
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../org/apache/sis/portrayal/PlanarCanvas.java | 2 +-
.../org/apache/sis/style/se1/StyleFactory.java | 2 +-
.../referencing/gazetteer/FinalLocationType.java | 2 +-
.../referencing/gazetteer/GazetteerFactory.java | 2 +-
.../gazetteer/GeohashReferenceSystem.java | 2 +-
.../sis/referencing/gazetteer/LocationFormat.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 6 +++---
.../gazetteer/ModifiableLocationTypeAdapter.java | 2 +-
.../gazetteer/ReferencingByIdentifiers.java | 4 ++--
.../sis/referencing/gazetteer/LocationViewer.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystemTest.java | 2 +-
...s.metadata.internal.shared.ReferencingServices} | 0
...e.sis.metadata.sql.internal.shared.Initializer} | 0
.../main/module-info.java | 6 +++---
.../sis/coordinate/DefaultCoordinateMetadata.java | 4 ++--
.../sis/geometry/AbstractDirectPosition.java | 6 +++---
.../org/apache/sis/geometry/AbstractEnvelope.java | 8 ++++----
.../org/apache/sis/geometry/ArrayEnvelope.java | 2 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 10 +++++-----
.../main/org/apache/sis/geometry/Envelope2D.java | 2 +-
.../org/apache/sis/geometry/EnvelopeReducer.java | 2 +-
.../main/org/apache/sis/geometry/Envelopes.java | 10 +++++-----
.../org/apache/sis/geometry/GeneralEnvelope.java | 4 ++--
.../main/org/apache/sis/geometry/Shapes2D.java | 6 +++---
.../apache/sis/geometry/WraparoundAdjustment.java | 6 +++---
.../apache/sis/geometry/WraparoundInEnvelope.java | 2 +-
.../main/org/apache/sis/io/wkt/Colors.java | 2 +-
.../main/org/apache/sis/io/wkt/Element.java | 4 ++--
.../org/apache/sis/io/wkt/FormattableObject.java | 4 ++--
.../main/org/apache/sis/io/wkt/Formatter.java | 10 +++++-----
.../apache/sis/io/wkt/GeodeticObjectParser.java | 20 ++++++++++----------
.../org/apache/sis/io/wkt/MathTransformParser.java | 8 ++++----
.../main/org/apache/sis/io/wkt/StoredTree.java | 2 +-
.../main/org/apache/sis/io/wkt/Transliterator.java | 6 +++---
.../main/org/apache/sis/io/wkt/VerticalInfo.java | 2 +-
.../main/org/apache/sis/io/wkt/WKTDictionary.java | 10 +++++-----
.../main/org/apache/sis/io/wkt/WKTFormat.java | 4 ++--
.../sis/parameter/AbstractParameterDescriptor.java | 4 ++--
.../sis/parameter/DefaultParameterDescriptor.java | 2 +-
.../parameter/DefaultParameterDescriptorGroup.java | 4 ++--
.../sis/parameter/DefaultParameterValue.java | 10 +++++-----
.../sis/parameter/DefaultParameterValueGroup.java | 2 +-
.../apache/sis/parameter/FilteredParameters.java | 2 +-
.../sis/parameter/MapProjectionDescriptor.java | 2 +-
.../sis/parameter/MapProjectionParameters.java | 4 ++--
.../org/apache/sis/parameter/MatrixParameters.java | 2 +-
.../sis/parameter/MatrixParametersAlphaNum.java | 4 ++--
.../org/apache/sis/parameter/ParameterFormat.java | 6 +++---
.../apache/sis/parameter/ParameterTableRow.java | 8 ++++----
.../org/apache/sis/parameter/TensorParameters.java | 2 +-
.../org/apache/sis/parameter/TensorValues.java | 10 +++++-----
.../sis/parameter/UninitializedParameter.java | 2 +-
.../sis/parameter/UnmodifiableParameterValue.java | 2 +-
.../parameter/UnmodifiableParameterValueGroup.java | 2 +-
.../main/org/apache/sis/parameter/Verifier.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 22 +++++++++++-----------
.../apache/sis/referencing/AuthorityFactories.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 12 ++++++------
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++---
.../sis/referencing/DefaultObjectDomain.java | 2 +-
.../sis/referencing/EPSGFactoryFallback.java | 6 +++---
.../referencing/EllipsoidalHeightSeparator.java | 10 +++++-----
.../sis/referencing/GeodesicsOnEllipsoid.java | 2 +-
.../apache/sis/referencing/GeodeticCalculator.java | 12 ++++++------
.../apache/sis/referencing/IdentifiedObjects.java | 14 +++++++-------
.../sis/referencing/ImmutableIdentifier.java | 8 ++++----
.../org/apache/sis/referencing/NameIterator.java | 8 ++++----
.../apache/sis/referencing/NamedIdentifier.java | 2 +-
.../org/apache/sis/referencing/Properties.java | 4 ++--
.../sis/referencing/StandardDefinitions.java | 8 ++++----
.../apache/sis/referencing/crs/AbstractCRS.java | 6 +++---
.../sis/referencing/crs/AbstractDerivedCRS.java | 6 +++---
.../sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultDerivedCRS.java | 6 +++---
.../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultGeographicCRS.java | 10 +++++-----
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 8 ++++----
.../sis/referencing/crs/DefaultTemporalCRS.java | 6 +++---
.../sis/referencing/crs/DefaultVerticalCRS.java | 2 +-
.../org/apache/sis/referencing/crs/DynamicCRS.java | 2 +-
.../sis/referencing/crs/ExplicitParameters.java | 6 +++---
.../org/apache/sis/referencing/cs/AbstractCS.java | 12 ++++++------
.../apache/sis/referencing/cs/AxesConvention.java | 2 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 4 ++--
.../sis/referencing/cs/CoordinateSystems.java | 6 +++---
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 4 ++--
.../cs/DefaultCoordinateSystemAxis.java | 12 ++++++------
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 6 +++---
.../org/apache/sis/referencing/cs/Normalizer.java | 6 +++---
.../org/apache/sis/referencing/cs/SubTypes.java | 2 +-
.../sis/referencing/datum/AbstractDatum.java | 18 +++++++++---------
.../sis/referencing/datum/BursaWolfParameters.java | 4 ++--
.../sis/referencing/datum/DatumOrEnsemble.java | 2 +-
.../sis/referencing/datum/DatumShiftGrid.java | 4 ++--
.../referencing/datum/DefaultDatumEnsemble.java | 10 +++++-----
.../sis/referencing/datum/DefaultEllipsoid.java | 12 ++++++------
.../referencing/datum/DefaultEngineeringDatum.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 12 ++++++------
.../sis/referencing/datum/DefaultImageDatum.java | 4 ++--
.../referencing/datum/DefaultParametricDatum.java | 2 +-
.../referencing/datum/DefaultPrimeMeridian.java | 14 +++++++-------
.../referencing/datum/DefaultTemporalDatum.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 6 +++---
.../sis/referencing/datum/TimeDependentBWP.java | 4 ++--
.../apache/sis/referencing/datum/package-info.java | 2 +-
.../factory/AuthorityFactoryIdentifier.java | 10 +++++-----
.../referencing/factory/AuthorityFactoryProxy.java | 2 +-
.../referencing/factory/CommonAuthorityCode.java | 4 ++--
.../factory/CommonAuthorityFactory.java | 4 ++--
.../factory/ConcurrentAuthorityFactory.java | 4 ++--
.../sis/referencing/factory/FilteredCodes.java | 2 +-
.../factory/GeodeticAuthorityFactory.java | 4 ++--
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../factory/IdentifiedObjectFinder.java | 6 +++---
.../factory/LazySynchronizedIterator.java | 2 +-
.../factory/MultiAuthoritiesFactory.java | 14 +++++++-------
.../sis/referencing/factory/ReferenceKeeper.java | 2 +-
.../referencing/factory/sql/AuthorityCodes.java | 6 +++---
.../referencing/factory/sql/EPSGCodeFinder.java | 14 +++++++-------
.../referencing/factory/sql/EPSGDataAccess.java | 14 +++++++-------
.../sis/referencing/factory/sql/EPSGFactory.java | 6 +++---
.../sis/referencing/factory/sql/EPSGInstaller.java | 6 +++---
.../factory/sql/InstallationScriptProvider.java | 2 +-
.../referencing/factory/sql/ObjectPertinence.java | 6 +++---
.../sis/referencing/factory/sql/SQLTranslator.java | 6 +++---
.../sis/referencing/factory/sql/TableInfo.java | 2 +-
.../sis/referencing/internal/AnnotatedMatrix.java | 2 +-
.../sis/referencing/internal/Arithmetic.java | 6 +++---
.../sis/referencing/internal/DatabaseListener.java | 4 ++--
.../referencing/internal/EPSGParameterDomain.java | 2 +-
.../org/apache/sis/referencing/internal/Epoch.java | 2 +-
.../apache/sis/referencing/internal/Legacy.java | 2 +-
.../sis/referencing/internal/MergedProperties.java | 2 +-
.../referencing/internal/ParameterizedAffine.java | 2 +-
.../internal/ParameterizedTransformBuilder.java | 8 ++++----
.../internal/PositionalAccuracyConstant.java | 2 +-
.../referencing/internal/ServicesForMetadata.java | 10 +++++-----
.../referencing/internal/VerticalDatumTypes.java | 2 +-
.../{privy => internal/shared}/AbstractShape.java | 2 +-
.../{privy => internal/shared}/AffineMatrix.java | 4 ++--
.../shared}/AffineTransform2D.java | 2 +-
.../{privy => internal/shared}/AxesMapper.java | 4 ++--
.../{privy => internal/shared}/AxisDirections.java | 6 +++---
.../shared}/CoordinateOperations.java | 10 +++++-----
.../shared}/DefinitionVerifier.java | 2 +-
.../shared}/DirectPositionView.java | 2 +-
.../shared}/EllipsoidalHeightCombiner.java | 2 +-
.../shared}/ExtendedPrecisionMatrix.java | 2 +-
.../{privy => internal/shared}/ExtentSelector.java | 4 ++--
.../shared}/FilteredIterator.java | 2 +-
.../{privy => internal/shared}/Formulas.java | 12 ++++++------
.../shared}/GeodeticObjectBuilder.java | 2 +-
.../shared}/IntervalRectangle.java | 4 ++--
.../{privy => internal/shared}/LazySet.java | 4 ++--
.../shared}/NilReferencingObject.java | 2 +-
.../shared}/ReferencingFactoryContainer.java | 4 ++--
.../shared}/ReferencingUtilities.java | 6 +++---
.../{privy => internal/shared}/ShapeUtilities.java | 2 +-
.../shared}/TemporalAccessor.java | 2 +-
.../{privy => internal/shared}/WKTKeywords.java | 2 +-
.../{privy => internal/shared}/WKTUtilities.java | 6 +++---
.../shared}/WraparoundApplicator.java | 4 ++--
.../shared}/WraparoundAxesFinder.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 18 +++++++++---------
.../operation/AbstractSingleOperation.java | 6 +++---
.../apache/sis/referencing/operation/CRSPair.java | 4 ++--
.../operation/CoordinateOperationContext.java | 4 ++--
.../operation/CoordinateOperationFinder.java | 12 ++++++------
.../operation/CoordinateOperationRegistry.java | 6 +++---
.../operation/DefaultConcatenatedOperation.java | 10 +++++-----
.../referencing/operation/DefaultConversion.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 6 +++---
.../sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/DefaultOperationMethod.java | 10 +++++-----
.../operation/DefaultPassThroughOperation.java | 4 ++--
.../operation/InverseOperationMethod.java | 2 +-
.../operation/MathTransformContext.java | 8 ++++----
.../operation/builder/LinearTransformBuilder.java | 10 +++++-----
.../operation/builder/LocalizationGridBuilder.java | 4 ++--
.../operation/builder/ResidualGrid.java | 6 +++---
.../operation/gridded/CompressedGrid.java | 2 +-
.../referencing/operation/gridded/GridGroup.java | 6 +++---
.../referencing/operation/gridded/LoadedGrid.java | 2 +-
.../sis/referencing/operation/gridded/Tile.java | 2 +-
.../operation/gridded/TileOrganizer.java | 2 +-
.../operation/matrix/AffineTransforms2D.java | 4 ++--
.../operation/matrix/GeneralMatrix.java | 4 ++--
.../sis/referencing/operation/matrix/Matrices.java | 8 ++++----
.../sis/referencing/operation/matrix/Matrix1.java | 2 +-
.../sis/referencing/operation/matrix/Matrix2.java | 2 +-
.../referencing/operation/matrix/MatrixSIS.java | 4 ++--
.../sis/referencing/operation/matrix/Solver.java | 2 +-
.../operation/matrix/UnmodifiableMatrix.java | 2 +-
.../operation/projection/AlbersEqualArea.java | 4 ++--
.../operation/projection/AuthalicConversion.java | 2 +-
.../operation/projection/ConformalProjection.java | 2 +-
.../operation/projection/CylindricalEqualArea.java | 2 +-
.../projection/EquidistantCylindrical.java | 2 +-
.../operation/projection/Initializer.java | 6 +++---
.../projection/LambertAzimuthalEqualArea.java | 4 ++--
.../projection/LambertConicConformal.java | 6 +++---
.../operation/projection/LongitudeWraparound.java | 4 ++--
.../referencing/operation/projection/Mercator.java | 2 +-
.../operation/projection/MeridianArcBased.java | 2 +-
.../operation/projection/NormalizedProjection.java | 6 +++---
.../operation/projection/ObliqueMercator.java | 2 +-
.../operation/projection/ObliqueStereographic.java | 4 ++--
.../operation/projection/PolarStereographic.java | 6 +++---
.../referencing/operation/projection/Robinson.java | 2 +-
.../operation/projection/SatelliteTracking.java | 2 +-
.../operation/projection/TransverseMercator.java | 2 +-
.../operation/projection/ZonedGridSystem.java | 2 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../sis/referencing/operation/provider/Affine.java | 4 ++--
.../referencing/operation/provider/EPSGName.java | 2 +-
.../operation/provider/Equirectangular.java | 4 ++--
.../provider/FranceGeocentricInterpolation.java | 2 +-
.../operation/provider/GeocentricAffine.java | 6 +++---
.../GeocentricAffineBetweenGeographic.java | 2 +-
.../operation/provider/Geographic2Dto3D.java | 2 +-
.../operation/provider/Geographic3Dto2D.java | 4 ++--
.../operation/provider/GeographicOffsets2D.java | 2 +-
.../operation/provider/Interpolation1D.java | 2 +-
.../operation/provider/LambertConformal2SP.java | 2 +-
.../operation/provider/LongitudeRotation.java | 2 +-
.../operation/provider/MapProjection.java | 2 +-
.../operation/provider/Mercator1SP.java | 2 +-
.../provider/MercatorAuxiliarySphere.java | 2 +-
.../operation/provider/MillerCylindrical.java | 2 +-
.../referencing/operation/provider/Mollweide.java | 2 +-
.../referencing/operation/provider/Molodensky.java | 6 +++---
.../sis/referencing/operation/provider/NTv2.java | 4 ++--
.../operation/provider/NorthPoleRotation.java | 2 +-
.../provider/ObliqueMercatorTwoPoints.java | 2 +-
.../operation/provider/PolarStereographicA.java | 6 +++---
.../referencing/operation/provider/Robinson.java | 2 +-
.../operation/provider/SatelliteTracking.java | 2 +-
.../operation/provider/SouthPoleRotation.java | 2 +-
.../operation/provider/Spherical2Dto3D.java | 2 +-
.../operation/provider/Spherical3Dto2D.java | 2 +-
.../operation/provider/TransverseMercator.java | 6 +++---
.../transform/AbstractLinearTransform.java | 4 ++--
.../operation/transform/AbstractMathTransform.java | 4 ++--
.../transform/AbstractMathTransform2D.java | 2 +-
.../operation/transform/CartesianToPolar.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 4 ++--
.../operation/transform/ContextualParameters.java | 14 +++++++-------
.../transform/CoordinateSystemTransform.java | 6 +++---
.../CoordinateSystemTransformBuilder.java | 4 ++--
.../transform/DefaultMathTransformFactory.java | 6 +++---
.../transform/EllipsoidToCentricTransform.java | 12 ++++++------
.../transform/EllipsoidToRadiusTransform.java | 10 +++++-----
.../transform/ExponentialTransform1D.java | 2 +-
.../operation/transform/IdentityTransform.java | 2 +-
.../transform/InterpolatedGeocentricTransform.java | 2 +-
.../operation/transform/InterpolatedTransform.java | 4 ++--
.../operation/transform/LinearInterpolator1D.java | 2 +-
.../operation/transform/LinearTransform1D.java | 8 ++++----
.../transform/LogarithmicTransform1D.java | 2 +-
.../operation/transform/MathTransformBuilder.java | 2 +-
.../operation/transform/MathTransforms.java | 6 +++---
.../operation/transform/MolodenskyTransform.java | 2 +-
.../operation/transform/OperationMethodSet.java | 2 +-
.../operation/transform/PassThroughTransform.java | 6 +++---
.../operation/transform/PolarToCartesian.java | 2 +-
.../operation/transform/PoleRotation.java | 6 +++---
.../operation/transform/PowerTransform1D.java | 2 +-
.../operation/transform/ProjectiveTransform.java | 10 +++++-----
.../operation/transform/ProjectiveTransform2D.java | 2 +-
.../operation/transform/ScaleTransform.java | 4 ++--
.../transform/SpecializableTransform.java | 2 +-
.../operation/transform/TransformJoiner.java | 2 +-
.../operation/transform/TransformSeparator.java | 4 ++--
.../operation/transform/TranslationTransform.java | 4 ++--
.../operation/transform/WraparoundTransform.java | 2 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../bind/referencing/CC_CoordinateOperation.java | 2 +-
.../referencing/CC_GeneralOperationParameter.java | 2 +-
.../sis/xml/bind/referencing/CS_AxisDirection.java | 2 +-
.../sis/xml/bind/referencing/CS_RangeMeaning.java | 2 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 8 ++++----
.../org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../org/apache/sis/geometry/TransformTestCase.java | 4 ++--
.../sis/geometry/WraparoundAdjustmentTest.java | 2 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 6 +++---
.../org/apache/sis/io/wkt/TransliteratorTest.java | 4 ++--
.../DefaultParameterDescriptorGroupTest.java | 2 +-
.../parameter/DefaultParameterDescriptorTest.java | 2 +-
.../sis/parameter/DefaultParameterValueTest.java | 2 +-
.../sis/parameter/MapProjectionParametersTest.java | 18 +++++++++---------
.../apache/sis/parameter/TensorParametersTest.java | 4 ++--
.../org/apache/sis/parameter/TensorValuesTest.java | 6 +++---
.../org/apache/sis/referencing/Assertions.java | 2 +-
.../sis/referencing/AuthorityFactoriesTest.java | 2 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 6 +++---
.../sis/referencing/GeodesicsOnEllipsoidTest.java | 4 ++--
.../sis/referencing/GeodeticCalculatorTest.java | 6 +++---
.../sis/referencing/GeodeticObjectVerifier.java | 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 4 ++--
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 ++--
.../referencing/crs/DefaultTemporalCRSTest.java | 4 ++--
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 ++--
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../sis/referencing/datum/GeodeticDatumMock.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 2 +-
.../referencing/datum/TimeDependentBWPTest.java | 2 +-
.../factory/CommonAuthorityFactoryTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 ++--
.../referencing/factory/sql/EPSGInstallerTest.java | 4 ++--
.../factory/sql/EPSGScriptProvider.java | 2 +-
.../apache/sis/referencing/internal/EpochTest.java | 2 +-
.../shared}/AbstractShapeTest.java | 2 +-
.../{privy => internal/shared}/AxesMapperTest.java | 2 +-
.../shared}/AxisDirectionsTest.java | 12 ++++++------
.../shared}/CoordinateOperationsTest.java | 2 +-
.../shared}/DefinitionVerifierTest.java | 2 +-
.../shared}/EllipsoidalHeightCombinerTest.java | 2 +-
.../shared}/ExtentSelectorTest.java | 2 +-
.../{privy => internal/shared}/FormulasTest.java | 4 ++--
.../shared}/GeodeticObjectBuilderTest.java | 2 +-
.../{privy => internal/shared}/LazySetTest.java | 2 +-
.../shared}/ReferencingUtilitiesTest.java | 4 ++--
.../shared}/ShapeUtilitiesExt.java | 2 +-
.../shared}/ShapeUtilitiesTest.java | 2 +-
.../shared}/ShapeUtilitiesViewer.java | 2 +-
.../shared}/WKTKeywordsTest.java | 2 +-
.../shared}/WKTUtilitiesTest.java | 4 ++--
.../shared}/WraparoundApplicatorTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 6 +++---
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../operation/DefaultConversionTest.java | 4 ++--
.../DefaultCoordinateOperationFactoryTest.java | 4 ++--
.../operation/DefaultTransformationTest.java | 2 +-
.../operation/HardCodedConversions.java | 2 +-
.../operation/matrix/GeneralMatrixTest.java | 2 +-
.../referencing/operation/matrix/MatricesTest.java | 2 +-
.../operation/matrix/MatrixTestCase.java | 4 ++--
.../operation/projection/AlbersEqualAreaTest.java | 2 +-
.../projection/AuthalicConversionTest.java | 2 +-
.../projection/AzimuthalEquidistantTest.java | 2 +-
.../operation/projection/CassiniSoldnerTest.java | 2 +-
.../projection/ConformalProjectionTest.java | 2 +-
.../projection/CylindricalEqualAreaTest.java | 2 +-
.../projection/EquidistantCylindricalTest.java | 2 +-
.../operation/projection/EquirectangularTest.java | 4 ++--
.../operation/projection/InitializerTest.java | 2 +-
.../projection/LambertAzimuthalEqualAreaTest.java | 6 +++---
.../projection/LambertConicConformalTest.java | 2 +-
.../projection/MapProjectionTestCase.java | 4 ++--
.../projection/MercatorMethodComparison.java | 4 ++--
.../operation/projection/MercatorTest.java | 4 ++--
.../operation/projection/MollweideTest.java | 2 +-
.../sis/referencing/operation/projection/NoOp.java | 2 +-
.../projection/NormalizedProjectionTest.java | 2 +-
.../projection/ObliqueStereographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../operation/projection/PolyconicTest.java | 2 +-
.../operation/projection/ProjectionBenchmark.java | 2 +-
.../projection/ProjectionResultComparator.java | 2 +-
.../operation/projection/RobinsonTest.java | 2 +-
.../projection/SatelliteTrackingTest.java | 2 +-
.../operation/projection/SinusoidalTest.java | 2 +-
.../projection/TransverseMercatorTest.java | 2 +-
.../operation/projection/ZonedGridSystemTest.java | 4 ++--
.../provider/CoordinateFrameRotationTest.java | 2 +-
.../provider/GeocentricTranslationTest.java | 4 ++--
.../operation/provider/Geographic3Dto2DTest.java | 2 +-
.../operation/provider/GeographicOffsetsTest.java | 2 +-
.../operation/provider/MapProjectionTest.java | 2 +-
.../referencing/operation/provider/NTv2Test.java | 2 +-
.../provider/PositionVector7ParamTest.java | 2 +-
.../operation/provider/ProvidersTest.java | 2 +-
.../operation/provider/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../transform/ConcatenatedTransformTest.java | 2 +-
.../operation/transform/CoordinateDomain.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 4 ++--
.../operation/transform/DomainDefinitionTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 2 +-
.../transform/InterpolatedTransformTest.java | 2 +-
.../operation/transform/LinearTransformTest.java | 2 +-
.../transform/MolodenskyTransformTest.java | 4 ++--
.../transform/OperationMethodSetTest.java | 2 +-
.../operation/transform/PoleRotationTest.java | 2 +-
.../transform/ProjectiveTransformTest.java | 6 +++---
.../operation/transform/ScaleTransformTest.java | 2 +-
.../transform/SpecializableTransformTest.java | 2 +-
.../transform/TranslationTransformTest.java | 4 ++--
.../transform/WraparoundTransformTest.java | 2 +-
.../report/CoordinateOperationMethods.java | 4 ++--
.../sis/referencing/report/HTMLGenerator.java | 2 +-
.../sis/test/integration/ConsistencyTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 2 +-
.../org/apache/sis/test/widget/package-info.java | 2 +-
.../CC_OperationParameterGroupTest.java | 2 +-
.../apache/sis/xml/bind/referencing/CodeTest.java | 2 +-
.../main/org/apache/sis/storage/landsat/Band.java | 2 +-
.../org/apache/sis/storage/landsat/BandGroup.java | 2 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/storage/landsat/MetadataReader.java | 12 ++++++------
.../sis/storage/geotiff/CompressedSubset.java | 2 +-
.../apache/sis/storage/geotiff/Compression.java | 2 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 8 ++++----
.../apache/sis/storage/geotiff/GeoTiffStore.java | 4 ++--
.../sis/storage/geotiff/GeoTiffStoreProvider.java | 2 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 12 ++++++------
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../org/apache/sis/storage/geotiff/Writer.java | 2 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 14 +++++++-------
.../geotiff/reader/GridGeometryBuilder.java | 2 +-
.../apache/sis/storage/geotiff/reader/Type.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 10 +++++-----
.../storage/geotiff/writer/ReformattedImage.java | 4 ++--
.../org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../storage/geotiff/reader/XMLMetadataTest.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 10 +++++-----
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 6 +++---
.../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
.../apache/sis/storage/netcdf/base/AxisType.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSMerger.java | 4 ++--
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../apache/sis/storage/netcdf/base/Decoder.java | 4 ++--
.../apache/sis/storage/netcdf/base/FeatureSet.java | 4 ++--
.../org/apache/sis/storage/netcdf/base/Grid.java | 2 +-
.../sis/storage/netcdf/base/GridCacheKey.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 10 +++++-----
.../apache/sis/storage/netcdf/base/Linearizer.java | 6 +++---
.../sis/storage/netcdf/base/NamedElement.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Node.java | 2 +-
.../sis/storage/netcdf/base/RasterResource.java | 8 ++++----
.../apache/sis/storage/netcdf/base/Variable.java | 6 +++---
.../storage/netcdf/base/VariableTransformer.java | 2 +-
.../sis/storage/netcdf/classic/ChannelDecoder.java | 4 ++--
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 2 +-
.../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/DimensionWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/GridWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/VariableWrapper.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../org/apache/sis/storage/sql/duckdb/DuckDB.java | 2 +-
.../apache/sis/storage/sql/feature/Analyzer.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Column.java | 6 +++---
.../apache/sis/storage/sql/feature/Database.java | 12 ++++++------
.../sis/storage/sql/feature/FeatureAdapter.java | 2 +-
.../sis/storage/sql/feature/FeatureIterator.java | 4 ++--
.../sis/storage/sql/feature/FeatureStream.java | 10 +++++-----
.../sis/storage/sql/feature/InfoStatements.java | 10 +++++-----
.../apache/sis/storage/sql/feature/PrimaryKey.java | 4 ++--
.../sis/storage/sql/feature/QueryAnalyzer.java | 4 ++--
.../apache/sis/storage/sql/feature/Relation.java | 4 ++--
.../sis/storage/sql/feature/SelectionClause.java | 4 ++--
.../storage/sql/feature/SelectionClauseWriter.java | 4 ++--
.../org/apache/sis/storage/sql/feature/Table.java | 8 ++++----
.../sis/storage/sql/feature/TableAnalyzer.java | 4 ++--
.../sis/storage/sql/feature/TableReference.java | 2 +-
.../sis/storage/sql/feature/ValueGetter.java | 4 ++--
.../sis/storage/sql/postgis/ExtentEstimator.java | 2 +-
.../apache/sis/storage/sql/postgis/Postgres.java | 2 +-
.../sis/storage/sql/postgis/RasterReader.java | 10 +++++-----
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../storage/sql/feature/InfoStatementsTest.java | 2 +-
.../sql/feature/TemporalValueGetterTest.java | 2 +-
.../sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../apache/sis/storage/sql/postgis/TestRaster.java | 2 +-
.../main/org/apache/sis/storage/gpx/Metadata.java | 2 +-
.../main/org/apache/sis/storage/gpx/Reader.java | 2 +-
.../main/org/apache/sis/storage/gpx/Types.java | 2 +-
.../main/org/apache/sis/storage/gpx/Writer.java | 2 +-
.../sis/storage/xml/stream/FormattedWriter.java | 2 +-
.../sis/storage/xml/stream/NamespaceEraser.java | 2 +-
.../sis/storage/xml/stream/StaxDataStore.java | 6 +++---
.../sis/storage/xml/stream/StaxStreamReader.java | 2 +-
.../test/org/apache/sis/storage/gpx/TypesTest.java | 2 +-
.../apache/sis/io/stream/ChannelDataOutput.java | 2 +-
.../apache/sis/io/stream/FileCacheByteChannel.java | 2 +-
.../main/org/apache/sis/io/stream/IOUtilities.java | 2 +-
.../sis/storage/AbstractGridCoverageResource.java | 2 +-
.../org/apache/sis/storage/CoverageSubset.java | 6 +++---
.../main/org/apache/sis/storage/DataStore.java | 2 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 4 ++--
.../main/org/apache/sis/storage/FeatureNaming.java | 2 +-
.../main/org/apache/sis/storage/FeatureQuery.java | 12 ++++++------
.../main/org/apache/sis/storage/FeatureSubset.java | 2 +-
.../main/org/apache/sis/storage/ProbeResult.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 4 ++--
.../sis/storage/aggregate/AggregatedResource.java | 2 +-
.../aggregate/BandAggregateGridResource.java | 6 +++---
.../storage/aggregate/ConcatenatedFeatureSet.java | 4 ++--
.../aggregate/ConcatenatedGridCoverage.java | 4 ++--
.../aggregate/ConcatenatedGridResource.java | 4 ++--
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../sis/storage/aggregate/DimensionSelector.java | 2 +-
.../apache/sis/storage/aggregate/GridSlice.java | 6 +++---
.../org/apache/sis/storage/aggregate/Group.java | 2 +-
.../sis/storage/aggregate/GroupAggregate.java | 2 +-
.../sis/storage/aggregate/GroupByTransform.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 2 +-
.../sis/storage/aggregate/MergeStrategy.java | 4 ++--
.../main/org/apache/sis/storage/base/CodeType.java | 4 ++--
.../apache/sis/storage/base/MetadataBuilder.java | 10 +++++-----
.../org/apache/sis/storage/base/PRJDataStore.java | 2 +-
.../apache/sis/storage/base/ResourceLineage.java | 4 ++--
.../apache/sis/storage/base/SimpleAggregate.java | 2 +-
.../apache/sis/storage/base/StoreUtilities.java | 2 +-
.../sis/storage/base/TiledDeferredImage.java | 2 +-
.../apache/sis/storage/base/TiledGridCoverage.java | 6 +++---
.../apache/sis/storage/base/TiledGridResource.java | 8 ++++----
.../org/apache/sis/storage/base/URIDataStore.java | 4 ++--
.../sis/storage/csv/MovingFeatureBuilder.java | 4 ++--
.../main/org/apache/sis/storage/csv/Store.java | 6 +++---
.../apache/sis/storage/esri/AsciiGridStore.java | 2 +-
.../org/apache/sis/storage/esri/RasterStore.java | 12 ++++++------
.../apache/sis/storage/esri/RawRasterReader.java | 8 ++++----
.../apache/sis/storage/esri/RawRasterStore.java | 6 +++---
.../apache/sis/storage/event/StoreListeners.java | 2 +-
.../main/org/apache/sis/storage/folder/Store.java | 2 +-
.../sis/storage/image/WorldFileResource.java | 6 +++---
.../apache/sis/storage/image/WorldFileStore.java | 4 ++--
.../sis/storage/modifier/CoverageModifier.java | 2 +-
.../main/org/apache/sis/storage/tiling/Tile.java | 2 +-
.../org/apache/sis/storage/wkt/StoreFormat.java | 2 +-
.../org/apache/sis/storage/wkt/StoreProvider.java | 2 +-
.../main/org/apache/sis/storage/xml/Store.java | 4 ++--
.../org/apache/sis/storage/xml/StoreProvider.java | 2 +-
.../org/apache/sis/storage/CoverageQueryTest.java | 2 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 2 +-
.../sis/storage/aggregate/CoverageMosaicTest.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSetTest.java | 2 +-
.../sis/storage/base/MemoryGridResourceTest.java | 2 +-
.../sis/storage/test/CoverageReadConsistency.java | 4 ++--
.../apache/sis/storage/test/SubsampledImage.java | 2 +-
.../sis/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../test/org/apache/sis/storage/xml/StoreTest.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 4 ++--
.../org/apache/sis/converter/StringConverter.java | 4 ++--
.../main/org/apache/sis/io/CompoundFormat.java | 6 +++---
.../main/org/apache/sis/io/DefaultFormat.java | 2 +-
.../org/apache/sis/io/IdentifiedObjectFormat.java | 6 +++---
.../main/org/apache/sis/io/LineAppender.java | 2 +-
.../main/org/apache/sis/io/TableAppender.java | 2 +-
.../main/org/apache/sis/math/ArrayVector.java | 2 +-
.../main/org/apache/sis/math/DecimalFunctions.java | 2 +-
.../main/org/apache/sis/math/Fraction.java | 2 +-
.../main/org/apache/sis/math/Line.java | 6 +++---
.../org/apache/sis/math/LinearlyDerivedVector.java | 2 +-
.../main/org/apache/sis/math/MathFunctions.java | 6 +++---
.../main/org/apache/sis/math/Plane.java | 6 +++---
.../main/org/apache/sis/math/Statistics.java | 4 ++--
.../main/org/apache/sis/math/StatisticsFormat.java | 2 +-
.../main/org/apache/sis/math/Vector.java | 2 +-
.../main/org/apache/sis/measure/AbstractUnit.java | 2 +-
.../main/org/apache/sis/measure/Angle.java | 2 +-
.../main/org/apache/sis/measure/AngleFormat.java | 4 ++--
.../org/apache/sis/measure/LinearConverter.java | 4 ++--
.../main/org/apache/sis/measure/NumberRange.java | 2 +-
.../main/org/apache/sis/measure/Prefixes.java | 2 +-
.../main/org/apache/sis/measure/Range.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
.../main/org/apache/sis/measure/Scalar.java | 2 +-
.../apache/sis/measure/SexagesimalConverter.java | 2 +-
.../main/org/apache/sis/measure/UnitDimension.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 6 +++---
.../main/org/apache/sis/measure/UnitRegistry.java | 2 +-
.../main/org/apache/sis/measure/UnitServices.java | 2 +-
.../main/org/apache/sis/measure/Units.java | 6 +++---
.../main/org/apache/sis/setup/About.java | 6 +++---
.../main/org/apache/sis/setup/Configuration.java | 2 +-
.../main/org/apache/sis/setup/GeometryLibrary.java | 2 +-
.../apache/sis/setup/InstallationResources.java | 6 +++---
.../apache/sis/setup/OptionalInstallations.java | 2 +-
.../main/org/apache/sis/system/DataDirectory.java | 2 +-
.../sis/util/AbstractInternationalString.java | 2 +-
.../main/org/apache/sis/util/ArgumentChecks.java | 2 +-
.../main/org/apache/sis/util/Characters.java | 4 ++--
.../main/org/apache/sis/util/Numbers.java | 4 ++--
.../apache/sis/util/collection/CodeListSet.java | 4 ++--
.../org/apache/sis/util/collection/Containers.java | 2 +-
.../sis/util/collection/DefaultTreeTable.java | 4 ++--
.../org/apache/sis/util/collection/DerivedSet.java | 2 +-
.../apache/sis/util/collection/IntegerList.java | 2 +-
.../sis/util/collection/TreeTableFormat.java | 6 +++---
.../sis/util/internal/AutoMessageFormat.java | 2 +-
.../shared}/AbstractIterator.java | 2 +-
.../{privy => internal/shared}/AbstractMap.java | 2 +-
.../shared}/AbstractMapEntry.java | 2 +-
.../sis/util/{privy => internal/shared}/Bag.java | 2 +-
.../shared}/CheckedArrayList.java | 2 +-
.../{privy => internal/shared}/CheckedHashSet.java | 2 +-
.../{privy => internal/shared}/CloneAccess.java | 2 +-
.../util/{privy => internal/shared}/Cloner.java | 2 +-
.../util/{privy => internal/shared}/CodeLists.java | 2 +-
.../{privy => internal/shared}/CollectionsExt.java | 2 +-
.../util/{privy => internal/shared}/Constants.java | 2 +-
.../{privy => internal/shared}/DefinitionURI.java | 8 ++++----
.../{privy => internal/shared}/DoubleDouble.java | 2 +-
.../{privy => internal/shared}/EmptyQueue.java | 2 +-
.../{privy => internal/shared}/LazyCandidate.java | 2 +-
.../shared}/ListOfUnknownSize.java | 2 +-
.../shared}/LocalizedParseException.java | 2 +-
.../shared}/MetadataServices.java | 2 +-
.../util/{privy => internal/shared}/Numerics.java | 6 +++---
.../{privy => internal/shared}/PropertyFormat.java | 2 +-
.../shared}/SetOfUnknownSize.java | 2 +-
.../util/{privy => internal/shared}/Strings.java | 2 +-
.../shared}/TreeFormatCustomization.java | 2 +-
.../sis/util/{privy => internal/shared}/URLs.java | 2 +-
.../shared}/UnmodifiableArrayList.java | 2 +-
.../util/{privy => internal/shared}/Unsafe.java | 2 +-
.../sis/util/{privy => internal/shared}/X364.java | 2 +-
.../{privy => internal/shared}/package-info.java | 2 +-
.../apache/sis/util/logging/MonolineFormatter.java | 6 +++---
.../sis/util/resources/IndexedResourceBundle.java | 4 ++--
.../test/org/apache/sis/io/WordWrapTest.java | 2 +-
.../org/apache/sis/measure/RangeFormatTest.java | 2 +-
.../test/org/apache/sis/test/TestCase.java | 2 +-
.../test/org/apache/sis/test/TestUtilities.java | 4 ++--
.../org/apache/sis/util/collection/CacheTest.java | 2 +-
.../apache/sis/util/collection/RangeSetTest.java | 4 ++--
.../shared}/AbstractMapTest.java | 2 +-
.../util/{privy => internal/shared}/BagTest.java | 2 +-
.../shared}/CheckedArrayListTest.java | 2 +-
.../shared}/CollectionsExtTest.java | 2 +-
.../{privy => internal/shared}/ConstantsTest.java | 2 +-
.../shared}/DefinitionURITest.java | 2 +-
.../shared}/DoubleDoubleTest.java | 2 +-
.../shared}/ListOfUnknownSizeTest.java | 2 +-
.../shared}/LocalizedParseExceptionTest.java | 2 +-
.../{privy => internal/shared}/NumericsTest.java | 4 ++--
.../{privy => internal/shared}/StringsTest.java | 2 +-
.../util/{privy => internal/shared}/X364Test.java | 4 ++--
.../sis/util/logging/MonolineFormatterTest.java | 2 +-
.../sis/storage/geoheif/CoverageBuilder.java | 10 +++++-----
.../apache/sis/storage/geoheif/GeoHeifStore.java | 2 +-
.../main/org/apache/sis/storage/geoheif/Group.java | 2 +-
.../sis/storage/geoheif/UncompressedImage.java | 4 ++--
.../org/apache/sis/storage/isobmff/TreeNode.java | 2 +-
.../apache/sis/storage/isobmff/base/HeaderBox.java | 2 +-
.../sis/storage/isobmff/mpeg/ComponentPalette.java | 2 +-
.../org/apache/sis/storage/geopackage/Content.java | 2 +-
.../sis/storage/geopackage/ContentWriter.java | 2 +-
.../apache/sis/storage/geopackage/GpkgStore.java | 2 +-
.../sis/storage/geopackage/GpkgStoreProvider.java | 4 ++--
.../sis/storage/shapefile/ShapefileStore.java | 6 +++---
.../sis/storage/shapefile/ShapefileStoreTest.java | 2 +-
netbeans-project/nbproject/project.properties | 8 ++++----
optional/build.gradle.kts | 2 +-
.../apache/sis/gui/controls/SyncWindowList.java | 2 +-
.../apache/sis/gui/controls/ValueColorMapper.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 4 ++--
.../main/org/apache/sis/gui/coverage/GridView.java | 2 +-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 4 ++--
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../org/apache/sis/gui/dataset/ExpandableList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureList.java | 2 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 4 ++--
.../org/apache/sis/gui/dataset/ResourceCell.java | 2 +-
.../apache/sis/gui/internal/DataStoreOpener.java | 2 +-
.../org/apache/sis/gui/internal/GUIUtilities.java | 2 +-
.../apache/sis/gui/internal/ImageConverter.java | 6 +++---
.../sis/gui/internal/PropertyValueFormats.java | 2 +-
.../sis/gui/internal/PropertyValueFormatter.java | 2 +-
.../apache/sis/gui/internal/io/FileAccessItem.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 8 ++++----
.../main/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
.../sis/gui/metadata/IdentificationInfo.java | 4 ++--
.../apache/sis/gui/metadata/MetadataSummary.java | 2 +-
.../sis/gui/metadata/RepresentationInfo.java | 2 +-
.../sis/gui/metadata/StandardMetadataTree.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 4 ++--
.../org/apache/sis/gui/referencing/CRSChooser.java | 2 +-
.../org/apache/sis/gui/referencing/CodeFilter.java | 2 +-
.../org/apache/sis/gui/referencing/MenuSync.java | 2 +-
.../gui/referencing/PositionableProjection.java | 4 ++--
.../gui/referencing/RecentReferenceSystems.java | 4 ++--
.../main/org/apache/sis/gui/referencing/Utils.java | 2 +-
.../sis/resources/embedded/EmbeddedResources.java | 4 ++--
.../resources/embedded/EmbeddedResourcesTest.java | 2 +-
.../apache/sis/resources/embedded/Generator.java | 4 ++--
.../factory/sql/epsg/ScriptProvider.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java | 6 +++---
.../main/org/apache/sis/storage/gdal/Band.java | 4 ++--
.../main/org/apache/sis/storage/gdal/Driver.java | 4 ++--
.../apache/sis/storage/gdal/FeatureIterator.java | 4 ++--
.../org/apache/sis/storage/gdal/FeatureLayer.java | 4 ++--
.../org/apache/sis/storage/gdal/FieldAccessor.java | 4 ++--
.../main/org/apache/sis/storage/gdal/GDAL.java | 2 +-
.../org/apache/sis/storage/gdal/GDALStore.java | 4 ++--
.../apache/sis/storage/gdal/GDALStoreProvider.java | 2 +-
.../main/org/apache/sis/storage/gdal/Opener.java | 2 +-
.../org/apache/sis/storage/gdal/SpatialRef.java | 2 +-
.../org/apache/sis/storage/gdal/TiledCoverage.java | 2 +-
.../org/apache/sis/storage/gdal/TiledResource.java | 8 ++++----
.../org/apache/sis/storage/gdal/GDALStoreTest.java | 2 +-
1152 files changed, 2076 insertions(+), 2076 deletions(-)
diff --cc endorsed/src/org.apache.sis.feature/main/module-info.java
index 74df0536bb,4930f89a37..eff8fb03ea
--- a/endorsed/src/org.apache.sis.feature/main/module-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/module-info.java
@@@ -45,12 -45,8 +45,12 @@@ module org.apache.sis.feature
org.apache.sis.storage,
org.apache.sis.storage.sql,
org.apache.sis.storage.shapefile, // In the "incubator" sub-project.
- org.apache.sis.cql, // In the "incubator" sub-project.
- org.apache.sis.portrayal.map; // In the "incubator" sub-project.
+ org.apache.sis.portrayal;
+
- exports org.apache.sis.filter.privy to
++ exports org.apache.sis.filter.internal.shared to
+ org.apache.sis.storage,
+ org.apache.sis.storage.sql,
+ org.apache.sis.storage.shapefile; // In the "incubator" sub-project.
exports org.apache.sis.filter.sqlmm to
org.apache.sis.geometry; // In the "incubator" sub-project.
@@@ -76,7 -76,12 +76,7 @@@
exports org.apache.sis.geometry.wrapper.j2d to
org.apache.sis.gui; // In the "optional" sub-project.
- exports org.apache.sis.coverage.privy to
- exports org.apache.sis.geometry.wrapper.jts to
- org.apache.sis.geometry, // In the "incubator" sub-project.
- org.apache.sis.portrayal.map, // In the "incubator" sub-project.
- org.apache.sis.cql; // In the "incubator" sub-project.
-
+ exports org.apache.sis.coverage.internal.shared to
org.apache.sis.storage,
org.apache.sis.storage.netcdf,
org.apache.sis.portrayal;
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
index 3645c181b8,7e414f32cb..5474212fa7
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
@@@ -39,10 -39,13 +39,10 @@@ import org.apache.sis.image.Interpolati
import org.apache.sis.image.PlanarImage;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.measure.NumberRange;
- import org.apache.sis.coverage.privy.SampleDimensions;
- import static org.apache.sis.util.privy.Numerics.saturatingAdd;
- import static org.apache.sis.util.privy.Numerics.saturatingSubtract;
+ import org.apache.sis.coverage.internal.shared.SampleDimensions;
+ import static org.apache.sis.util.internal.shared.Numerics.saturatingAdd;
+ import static org.apache.sis.util.internal.shared.Numerics.saturatingSubtract;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
-
/**
* Combines an arbitrary number of coverages into a single one.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index ff597fd7bd,8f5f96b74f..9db146f999
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@@ -23,13 -23,13 +23,13 @@@ import org.opengis.referencing.operatio
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.StringBuilders;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
-import org.opengis.coverage.PointOutsideCoverageException;
-import org.opengis.coverage.grid.GridCoordinates;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.coverage.PointOutsideCoverageException;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
index f3d3a3923f,01b2a5ce33..86a357c4c8
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/shared/CommonDomainFinder.java
@@@ -31,13 -31,13 +31,13 @@@ import org.apache.sis.coverage.grid.Gri
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.IllegalGridGeometryException;
import org.apache.sis.coverage.grid.PixelInCell;
- import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
+ import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.util.Numbers;
- import org.apache.sis.util.privy.Numerics;
+ import org.apache.sis.util.internal.shared.Numerics;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
index 6cc3b37b6b,ae57b3522e..cf2195246c
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
@@@ -31,9 -31,23 +31,9 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.Containers;
- import org.apache.sis.util.privy.CheckedArrayList;
+ import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.feature.internal.Resources;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.feature.InvalidPropertyValueException;
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociation;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.Operation;
-
/**
* An instance of a {@linkplain DefaultFeatureType feature type} containing values for a real-world phenomena.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
index 8b579e0324,d3d0c1af24..22c71ed508
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
@@@ -18,12 -18,18 +18,12 @@@ package org.apache.sis.feature
import java.util.Map;
import org.opengis.util.GenericName;
- import org.apache.sis.util.privy.Cloner;
- import org.apache.sis.util.privy.CloneAccess;
- import org.apache.sis.util.privy.AbstractMap;
- import org.apache.sis.util.privy.AbstractMapEntry;
+ import org.apache.sis.util.internal.shared.Cloner;
+ import org.apache.sis.util.internal.shared.CloneAccess;
+ import org.apache.sis.util.internal.shared.AbstractMap;
+ import org.apache.sis.util.internal.shared.AbstractMapEntry;
import org.apache.sis.feature.internal.Resources;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.InvalidPropertyValueException;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* Implementation of {@link AbstractAttribute#characteristics()} map.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
index 46f15912cb,aba59be67e..88a335cf2a
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
@@@ -26,8 -26,16 +26,8 @@@ import org.opengis.util.GenericName
import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.apache.sis.feature.internal.Resources;
- import org.apache.sis.feature.privy.AttributeConvention;
+ import org.apache.sis.feature.internal.shared.AttributeConvention;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociation;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* Indicates the role played by the association between two features.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
index fe3fcb2b40,fb9a800298..940ca98772
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
@@@ -36,10 -36,21 +36,10 @@@ import org.opengis.util.InternationalSt
import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.collection.Containers;
- import org.apache.sis.util.privy.CollectionsExt;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.feature.internal.Resources;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.Operation;
-import org.opengis.feature.FeatureInstantiationException;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* Abstraction of a real-world phenomena. A {@code FeatureType} instance describes the class of all
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
index a95fe10933,af8344ec28..09389e8396
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
@@@ -22,9 -22,15 +22,9 @@@ import java.util.Optional
import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.metadata.quality.DataQuality;
import org.apache.sis.util.ArgumentChecks;
- import org.apache.sis.util.privy.CloneAccess;
- import org.apache.sis.util.privy.Cloner;
+ import org.apache.sis.util.internal.shared.CloneAccess;
+ import org.apache.sis.util.internal.shared.Cloner;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Property;
-import org.opengis.feature.Attribute;
-import org.opengis.feature.FeatureAssociation;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* A feature in which most properties are expected to be provided. This implementation uses a plain array for
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
index 0449cc2a29,cb855771e2..291718d752
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
@@@ -23,14 -23,19 +23,14 @@@ import java.util.Collection
import java.util.function.Function;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
- import org.apache.sis.filter.privy.FunctionNames;
- import org.apache.sis.filter.privy.Visitor;
+ import org.apache.sis.filter.internal.shared.FunctionNames;
+ import org.apache.sis.filter.internal.shared.Visitor;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.CodeList;
-import org.opengis.feature.Feature;
-import org.opengis.feature.Property;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.filter.Filter;
-import org.opengis.filter.Expression;
-import org.opengis.filter.LogicalOperator;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
index 07d883ef4b,ae5b2c7c98..aee1db9d63
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureOperations.java
@@@ -26,13 -26,18 +26,13 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.Static;
import org.apache.sis.util.collection.WeakHashSet;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.filter.DefaultFilterFactory;
- import org.apache.sis.filter.privy.XPath;
+ import org.apache.sis.filter.internal.shared.XPath;
import org.apache.sis.setup.GeometryLibrary;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.Operation;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.filter.Expression;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
index 64d4fbe988,4ef3d47351..d7391f2a31
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/GroupAsPolylineOperation.java
@@@ -28,8 -28,16 +28,8 @@@ import org.apache.sis.geometry.wrapper.
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.setup.GeometryLibrary;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.Operation;
-
/**
* Creates a single (Multi){@code Polyline} instance from a sequence of points or polylines stored in another property.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
index ecca415815,e4155ae136..b8b00a268c
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
@@@ -18,9 -18,15 +18,9 @@@ package org.apache.sis.feature
import java.util.Collection;
import org.apache.sis.util.ArgumentChecks;
- import org.apache.sis.util.privy.CheckedArrayList;
+ import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.feature.internal.Resources;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.MultiValuedPropertyException;
-
/**
* An instance of an {@linkplain DefaultAssociationRole association role} containing an arbitrary number of values.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
index 540e63e97b,c1517e71f9..e7e3fde890
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
@@@ -20,8 -20,18 +20,8 @@@ import java.util.Collection
import java.util.Collections;
import java.io.Serializable;
import org.opengis.util.GenericName;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Set;
-import org.opengis.util.InternationalString;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.feature.FeatureInstantiationException;
-import org.apache.sis.feature.internal.Resources;
-
/**
* A feature type identified only by its name. Instances of {@code NamedFeatureType} shall be used only as placeholder
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
index 2ef54b20b7,1a623d3821..72f572a99e
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
@@@ -17,8 -17,11 +17,8 @@@
package org.apache.sis.feature;
import java.util.Objects;
- import org.apache.sis.util.privy.CloneAccess;
+ import org.apache.sis.util.internal.shared.CloneAccess;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-
/**
* An instance of an {@linkplain DefaultAttributeType attribute type} containing at most one value.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
index e74ed55aff,6ddc2667dd..dc007fb622
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
@@@ -25,9 -25,15 +25,9 @@@ import org.opengis.metadata.maintenance
import org.opengis.metadata.quality.DataQuality;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CorruptedObjectException;
- import org.apache.sis.util.privy.CloneAccess;
- import org.apache.sis.util.privy.Cloner;
+ import org.apache.sis.util.internal.shared.CloneAccess;
+ import org.apache.sis.util.internal.shared.Cloner;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Property;
-import org.opengis.feature.Attribute;
-import org.opengis.feature.FeatureAssociation;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* A feature in which only a small fraction of properties are expected to be provided. This implementation uses
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
index 02d2310d03,5729aefcaf..2a3ba0ad2c
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
@@@ -32,13 -32,25 +32,13 @@@ import org.apache.sis.util.ObjectConver
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
- import org.apache.sis.util.privy.CollectionsExt;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.converter.SurjectiveConverter;
- import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
+ import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.util.resources.Errors;
-// 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.FeatureAssociationRole;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.InvalidPropertyValueException;
-import org.opengis.feature.Operation;
-import org.opengis.feature.Property;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.PropertyNotFoundException;
-
/**
* An operation concatenating the string representations of the values of multiple properties.
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
index 9796665544,9807ccfbd0..5a26826fcf
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
@@@ -25,15 -25,15 +25,15 @@@ import java.util.function.UnaryOperator
import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Vocabulary;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
- import org.apache.sis.filter.privy.ListingPropertyVisitor;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
+ import org.apache.sis.filter.internal.shared.ListingPropertyVisitor;
import org.apache.sis.io.TableAppender;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
index 5a78fafad0,3ca1254b1b..1b331f370e
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/MovingFeatures.java
@@@ -23,10 -23,11 +23,10 @@@ import org.apache.sis.util.iso.Names
import org.apache.sis.math.Vector;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.referencing.crs.DefaultTemporalCRS;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.AttributeType;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractAttribute;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
index 43b9a49c15,657a64b49f..cbbd16ab0c
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/AssociationValue.java
@@@ -22,17 -22,17 +22,17 @@@ import java.util.List
import java.util.Collection;
import java.util.Optional;
import org.apache.sis.feature.Features;
- import org.apache.sis.feature.privy.FeatureProjectionBuilder;
+ import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
import org.apache.sis.math.FunctionProperty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureAssociationRole;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.opengis.util.ScopedName;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAssociationRole;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.Name;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
index 4d3919e7a1,f2a7b4ef71..93c0d207e8
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/IdentifierFilter.java
@@@ -20,10 -20,13 +20,10 @@@ import java.util.List
import java.util.Collection;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.filter.internal.Node;
- import org.apache.sis.feature.privy.AttributeConvention;
+ import org.apache.sis.feature.internal.shared.AttributeConvention;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ResourceId;
-import org.opengis.filter.Filter;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
index 6127180fbf,d641643596..c44f0db0a6
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
@@@ -22,12 -22,13 +22,12 @@@ import java.util.LinkedHashSet
import java.util.Objects;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.filter.internal.Node;
- import org.apache.sis.util.privy.CollectionsExt;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Filter;
-import org.opengis.filter.LogicalOperator;
-import org.opengis.filter.LogicalOperatorName;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
+import org.apache.sis.pending.geoapi.filter.LogicalOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
index dca145e5a0,71c84d6fe1..ff90243290
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
@@@ -27,13 -27,15 +27,13 @@@ import org.opengis.util.CodeList
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.filter.internal.Node;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Filter;
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
-import org.opengis.filter.LogicalOperator;
-import org.opengis.filter.LogicalOperatorName;
-import org.opengis.feature.FeatureType;
+// Specific to the main branch:
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.Literal;
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
+import org.apache.sis.pending.geoapi.filter.LogicalOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
index e32e0d0155,7b7d9c4d27..0f0a0a817b
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/PropertyValue.java
@@@ -23,18 -23,17 +23,18 @@@ import org.apache.sis.feature.Features
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
- import org.apache.sis.feature.privy.FeatureProjectionBuilder;
- import org.apache.sis.filter.privy.XPath;
+ import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
+ import org.apache.sis.filter.internal.shared.XPath;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.opengis.util.ScopedName;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.pending.geoapi.filter.Name;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
index af083af1be,64a5121d8e..66a66ddb73
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
@@@ -20,11 -20,15 +20,11 @@@ import java.time.DateTimeException
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.temporal.TimeMethods;
- import org.apache.sis.feature.privy.FeatureExpression;
+ import org.apache.sis.feature.internal.shared.FeatureExpression;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Period;
-import org.opengis.filter.Filter;
-import org.opengis.filter.Expression;
-import org.opengis.filter.TemporalOperator;
-import org.opengis.filter.TemporalOperatorName;
-import org.opengis.filter.InvalidFilterValueException;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Period;
+import org.apache.sis.pending.geoapi.temporal.TemporalOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
index ac05d62d3d,de82d0562e..9fc9c545ef
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java
@@@ -19,13 -19,14 +19,13 @@@ package org.apache.sis.filter.internal
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
- import org.apache.sis.feature.privy.AttributeConvention;
- import org.apache.sis.filter.privy.XPath;
+ import org.apache.sis.feature.internal.shared.AttributeConvention;
+ import org.apache.sis.filter.internal.shared.XPath;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
-import org.opengis.filter.InvalidFilterValueException;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
index 9c1d3a5db4,f54ca83695..d088fd8b79
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/shared/SortByComparator.java
@@@ -23,12 -23,12 +23,12 @@@ import java.util.LinkedHashMap
import java.util.Comparator;
import java.io.Serializable;
import org.apache.sis.util.ArgumentChecks;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.SortBy;
-import org.opengis.filter.SortProperty;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.filter.SortBy;
+import org.apache.sis.pending.geoapi.filter.SortProperty;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
index 5e34c7bf7c,d031ff73d7..0495128fdb
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
@@@ -24,13 -24,14 +24,13 @@@ import org.opengis.util.FactoryExceptio
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
- import org.apache.sis.feature.privy.FeatureProjectionBuilder;
- import org.apache.sis.util.privy.Constants;
+ import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder;
+ import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
-import org.opengis.filter.InvalidFilterValueException;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
+import org.apache.sis.pending.geoapi.filter.Literal;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
index efe88a1f58,d61c51024f..a1bc5348f1
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
@@@ -22,11 -22,12 +22,11 @@@ import static java.lang.Double.isNaN
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Expression;
-import org.opengis.filter.InvalidFilterValueException;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
/**
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Wrapper.java
index 540081db24,ee2828c272..ffdd9fb287
--- 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
@@@ -45,9 -45,9 +45,9 @@@ import org.opengis.util.FactoryExceptio
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
-import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.TransformException;
- import org.apache.sis.referencing.privy.ReferencingUtilities;
+ import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
index 8f606e10e4,46303499b5..e1fb102c8d
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
@@@ -44,11 -44,14 +44,11 @@@ import org.apache.sis.util.ArraysExt
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.measure.NumberRange;
- import org.apache.sis.util.privy.Numerics;
+ import org.apache.sis.util.internal.shared.Numerics;
import org.apache.sis.feature.internal.Resources;
- import org.apache.sis.image.privy.ImageUtilities;
+ import org.apache.sis.image.internal.shared.ImageUtilities;
import static org.apache.sis.pending.jdk.JDK18.ceilDiv;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
-
/**
* An iterator over sample values in a raster or an image. This iterator makes easier to read and write efficiently
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
index a2d6c7cf29,0000000000..0c7b24da69
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/Name.java
@@@ -1,41 -1,0 +1,41 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.pending.geoapi.filter;
+
+import org.opengis.util.LocalName;
+import org.opengis.util.ScopedName;
- import org.apache.sis.filter.privy.FunctionNames;
++import org.apache.sis.filter.internal.shared.FunctionNames;
+import org.apache.sis.util.iso.Names;
+
+
+/**
+ * Placeholder for GeoAPI 3.1 interfaces (not yet released).
+ * Shall not be visible in public API, as it will be deleted after next GeoAPI release.
+ */
+@SuppressWarnings("doclint:missing")
+public final class Name {
+ static final LocalName STANDARD = Names.createLocalName(null, null, "fes");
+
+ static final LocalName EXTENSION = Names.createLocalName(null, null, "extension");
+
+ public static final ScopedName LITERAL = Names.createScopedName(STANDARD, null, FunctionNames.Literal);
+
+ public static final ScopedName VALUE_REFERENCE = Names.createScopedName(STANDARD, null, FunctionNames.ValueReference);
+
+ private Name() {
+ }
+}
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
index 5b791fcaf5,7bfedb9f3d..41c8e3204c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
@@@ -19,11 -19,11 +19,11 @@@ package org.apache.sis.metadata
import java.util.Iterator;
import java.util.Collection;
import org.apache.sis.util.Emptiable;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
import static org.apache.sis.metadata.ValueExistencePolicy.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
index e0497096ce,b94f3dc48a..2257a05831
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
@@@ -28,15 -28,15 +28,15 @@@ import org.apache.sis.util.Exceptions
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.MetadataServices;
+ import org.apache.sis.util.internal.shared.MetadataServices;
import org.apache.sis.system.SystemListener;
- import org.apache.sis.metadata.sql.privy.Initializer;
- import org.apache.sis.metadata.privy.Identifiers;
- import org.apache.sis.metadata.privy.ReferencingServices;
+ import org.apache.sis.metadata.sql.internal.shared.Initializer;
+ import org.apache.sis.metadata.internal.shared.Identifiers;
+ import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.xml.bind.Context;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
index f63fedcbf8,64f99be63a..3b55c60749
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
@@@ -35,15 -35,11 +35,15 @@@ import org.apache.sis.xml.bind.FilterBy
import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
- import org.apache.sis.xml.privy.LegacyNamespaces;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.TelephoneType;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+import org.apache.sis.pending.geoapi.evolution.UnsupportedCodeList;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
index 45cece31df,da6a3dd660..175c7ce94f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
@@@ -28,11 -28,17 +28,11 @@@ import org.opengis.metadata.citation.Re
import org.opengis.metadata.citation.Role;
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.Types;
- import org.apache.sis.xml.privy.LegacyNamespaces;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Individual;
-import org.opengis.metadata.citation.Organisation;
-import org.opengis.metadata.citation.Responsibility;
-
/**
* Identification of, and means of communication with, person(s) and
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
index 220b7587ff,934e3b21b1..0abe90f349
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
@@@ -36,12 -36,10 +36,12 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.MD_Identifier;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.AttributeGroup;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
index f6f78e7fde,c882b7037c..a6fe7e5e2e
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
@@@ -32,13 -32,10 +32,13 @@@ import org.apache.sis.xml.bind.lan.PT_L
import org.apache.sis.xml.bind.lan.LocaleAndCharset;
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.FeatureTypeInfo;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
index 74ebd7fe46,033f7768d9..a5ed649096
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
@@@ -23,13 -23,10 +23,13 @@@ import org.opengis.util.GenericName
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.ISOMetadata;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.FeatureTypeInfo;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
index fe1e286ac3,f802c57090..424d2b8a68
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
@@@ -35,13 -35,10 +35,13 @@@ import org.apache.sis.xml.bind.gco.GO_I
import org.apache.sis.xml.bind.gco.GO_Record;
import org.apache.sis.xml.bind.gco.GO_RecordType;
import org.apache.sis.xml.bind.metadata.MI_RangeElementDescription;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.content.SampleDimension;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
index 72455b09a3,021413f0cf..128e4d5060
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
@@@ -33,14 -33,9 +33,14 @@@ import org.apache.sis.measure.ValueRang
import org.apache.sis.metadata.internal.Dependencies;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.gts.TM_Duration;
- import org.apache.sis.util.privy.CollectionsExt;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Technical means and media by which a resource is obtained from the distributor.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
index 67063f1876,88d1aeab92..5ccc82f9ee
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
@@@ -31,18 -31,12 +31,18 @@@ import org.apache.sis.metadata.internal
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
import org.apache.sis.xml.bind.FilterByVersion;
- import org.apache.sis.xml.privy.LegacyNamespaces;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.metadata.MD_Medium;
import org.apache.sis.xml.bind.metadata.CI_Citation;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.MANDATORY;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Description of the computer language construct that specifies the representation
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index 746e1840c6,00cbad7b00..4de5ef482e
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@@ -41,14 -41,12 +41,14 @@@ import static org.apache.sis.metadata.i
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.distribution.MediumName;
- import org.apache.sis.util.privy.CodeLists;
+ import org.apache.sis.util.internal.shared.CodeLists;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.AbstractSet;
-import java.util.Iterator;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
++import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
index 9fe2c6a882,ce8060ae0d..c95be4a353
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
@@@ -27,14 -27,9 +27,14 @@@ import org.opengis.metadata.extent.Geog
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.metadata.extent.SpatialTemporalExtent;
import org.opengis.referencing.operation.TransformException;
- import org.apache.sis.metadata.privy.ReferencingServices;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+ import org.apache.sis.metadata.internal.shared.ReferencingServices;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Extent with respect to date/time and spatial boundaries.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index cffddcdb70,82433cdde1..1213b0afac
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@@ -71,14 -71,13 +71,14 @@@ import org.apache.sis.util.iso.Types
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.temporal.TemporalDate;
- import static org.apache.sis.util.privy.CollectionsExt.nonNull;
+ import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
- import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
+ import static org.apache.sis.metadata.internal.shared.ReferencingServices.AUTHALIC_RADIUS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-import org.opengis.coordinate.MismatchedCoordinateMetadataException;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
+import org.opengis.referencing.datum.VerticalDatumType;
+import org.apache.sis.pending.geoapi.evolution.Interim;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
index 214eac6692,283b881342..81830af8c9
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
@@@ -29,15 -29,14 +29,15 @@@ import org.apache.sis.metadata.iso.ISOM
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.bind.FilterByVersion;
import org.apache.sis.xml.bind.metadata.SV_OperationMetadata;
- import org.apache.sis.xml.privy.LegacyNamespaces;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import org.apache.sis.xml.bind.gco.GO_GenericName;
- import org.apache.sis.util.privy.Constants;
+ import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.iso.Names;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.identification.CoupledResource;
-import org.opengis.metadata.identification.OperationMetadata;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
index 5d040dd101,7c0fa91be5..dadaab0945
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultResolution.java
@@@ -30,13 -30,8 +30,13 @@@ import org.apache.sis.xml.bind.gco.Inte
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.resources.Messages;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Level of detail expressed as a scale factor or a ground distance.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
index 31e09beb07,b0a148ab8f..3ed9d8ac49
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
@@@ -19,11 -19,19 +19,11 @@@ package org.apache.sis.metadata.iso.ide
import java.util.Map;
import java.util.HashMap;
import java.util.Collection;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Collections;
-import java.io.Serializable;
-import org.opengis.metadata.citation.OnlineResource;
-import org.opengis.metadata.identification.CoupledResource;
-import org.opengis.metadata.identification.DistributedComputingPlatform;
-import org.opengis.metadata.identification.OperationMetadata;
-
/**
- * An {@code OperationMetadata} placeholder to be replaced later by a reference to another {@link OperationMetadata}.
+ * An {@code OperationMetadata} placeholder to be replaced later by a reference to another {@code OperationMetadata}.
* This temporary place holder is used when the operation name is unmarshalled before the actual operation definition.
*
* @author Martin Desruisseaux (Geomatys)
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
index f576f3097c,a58349d970..a407d696a8
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
@@@ -26,14 -26,8 +26,14 @@@ import org.opengis.metadata.maintenance
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.Namespaces;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+import org.apache.sis.metadata.internal.Dependencies;
+import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
- import org.apache.sis.util.privy.CollectionsExt;
++import org.apache.sis.util.internal.shared.CollectionsExt;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
index 8db20c843a,53abd7d6e5..2ccddbffda
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractElement.java
@@@ -43,14 -43,14 +43,14 @@@ import org.apache.sis.xml.bind.gco.Inte
import org.apache.sis.metadata.iso.legacy.DateToTemporal;
import org.apache.sis.metadata.iso.legacy.TemporalToDate;
import org.apache.sis.metadata.internal.Dependencies;
- import org.apache.sis.xml.privy.LegacyNamespaces;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.TemporalQuality;
-import org.opengis.metadata.quality.EvaluationMethod;
-import org.opengis.metadata.quality.MeasureReference;
-import org.opengis.metadata.quality.Metaquality;
+// Specific to the main branch:
+import org.opengis.metadata.quality.TemporalAccuracy;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
index 89eb5cfd4e,8c37f88284..60da3835b6
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
@@@ -28,13 -28,8 +28,13 @@@ import org.opengis.metadata.distributio
import org.opengis.metadata.spatial.SpatialRepresentation;
import org.opengis.metadata.spatial.SpatialRepresentationType;
import org.apache.sis.xml.bind.FilterByVersion;
- import org.apache.sis.xml.privy.LegacyNamespaces;
+ import org.apache.sis.xml.internal.shared.LegacyNamespaces;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
+
/**
* Result of a data quality measure organising the measured values as a coverage.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
index 6460f4888b,1a0b177c10..f646594bd4
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
@@@ -35,12 -35,12 +35,12 @@@ import org.apache.sis.util.internal.sha
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
- import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.valueIfDefined;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.EvaluationMethod;
-import org.opengis.metadata.quality.DataEvaluation;
-import org.opengis.metadata.quality.AggregationDerivation;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
index a92bd391b0,0b21fc965d..064bca7783
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
@@@ -23,14 -23,11 +23,14 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.quality.Element;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.iso.Types;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.quality.MeasureReference;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.UNSPECIFIED;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
index 041c08bd8e,a1f8d7fb98..4f2e44e7ac
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
@@@ -30,13 -30,8 +30,13 @@@ import org.apache.sis.metadata.TitlePro
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.util.ArgumentChecks;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ensurePositive;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive;
+// Specific to the main branch:
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
+
/**
* Axis properties.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
index 32ffb58faa,02393d9ae1..81e709b0a7
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
@@@ -21,18 -21,8 +21,18 @@@ import java.io.Serializable
import org.opengis.metadata.citation.Citation;
import org.opengis.util.InternationalString;
import org.apache.sis.util.SimpleInternationalString;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
+// Specific to the main branch:
+import java.util.Date;
+import java.util.Collection;
+import java.util.Collections;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.CitationDate;
+import org.opengis.metadata.citation.PresentationForm;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Series;
+
/**
* A trivial implementation of {@link Citation} containing only a title.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
index 195b46c59a,02e222ad38..a0d10ce269
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
@@@ -21,11 -21,8 +21,11 @@@ import org.opengis.metadata.extent.Exte
import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.TemporalExtent;
import org.opengis.metadata.extent.VerticalExtent;
- import static org.apache.sis.util.privy.CollectionsExt.singletonOrEmpty;
+ import static org.apache.sis.util.internal.shared.CollectionsExt.singletonOrEmpty;
+// Specific to the main branch:
+import org.opengis.util.InternationalString;
+
/**
* A trivial implementation of {@link Extent} containing only geographic, vertical and temporal extent.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
index 5ac0d5a56a,4cb3962f21..e77edd38f8
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
@@@ -20,10 -20,10 +20,10 @@@ import java.util.Collection
import java.util.Collections;
import org.opengis.util.InternationalString;
import org.opengis.metadata.distribution.Format;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Citation;
+// Specific to the main branch:
+import org.opengis.metadata.distribution.Distributor;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
index c2b6c7f862,1eb1fd9488..3eb34c344f
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
@@@ -45,15 -45,14 +45,15 @@@ import org.apache.sis.metadata.TypeValu
import org.apache.sis.metadata.ValueExistencePolicy;
import org.apache.sis.metadata.TitleProperty;
import org.apache.sis.metadata.iso.citation.Citations;
- import org.apache.sis.metadata.sql.privy.SQLBuilder;
- import org.apache.sis.metadata.sql.privy.Reflection;
- import org.apache.sis.util.privy.Constants;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
+ import org.apache.sis.metadata.sql.internal.shared.Reflection;
+ import org.apache.sis.util.internal.shared.Constants;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.xml.IdentifiedObject;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
index 0db49a9a5b,aceca11553..913b4fd375
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/DefaultPeriod.java
@@@ -24,12 -24,12 +24,12 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.LazyCandidate;
+ import org.apache.sis.util.internal.shared.LazyCandidate;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Instant;
-import org.opengis.temporal.Period;
-import org.opengis.filter.TemporalOperatorName;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Instant;
+import org.apache.sis.pending.geoapi.temporal.Period;
+import org.apache.sis.pending.geoapi.temporal.TemporalOperatorName;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
index 894d4c6ac5,222fd96dd8..e8b5860f79
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/temporal/GeneralDuration.java
@@@ -34,12 -34,13 +34,12 @@@ import java.time.temporal.TemporalAmoun
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
import org.apache.sis.pending.jdk.JDK18;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Instant;
-import org.opengis.temporal.IndeterminateValue;
-import org.opengis.temporal.IndeterminatePositionException;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Instant;
+import org.apache.sis.pending.geoapi.temporal.IndeterminateValue;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
index f556a041c2,ee91574252..535065ee72
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
@@@ -37,8 -37,11 +37,8 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.metadata.simple.SimpleAttributeType;
import org.apache.sis.converter.SurjectiveConverter;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-
/**
* A collection of record types in a given namespace.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
index 9e7965f145,71937351ed..f791fc49b0
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
@@@ -42,8 -42,11 +42,8 @@@ import org.apache.sis.util.CharSequence
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.converter.SurjectiveConverter;
- import org.apache.sis.metadata.privy.RecordSchemaSIS;
+ import org.apache.sis.metadata.internal.shared.RecordSchemaSIS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.NameFactory;
-
/**
* An immutable definition of the type of a {@linkplain DefaultRecord record}.
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
index 29ea7632df,b691609635..7cc6cc4700
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
@@@ -28,11 -28,11 +28,11 @@@ import org.opengis.util.MemberName
import org.apache.sis.util.Classes;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.CharSequences;
- import org.apache.sis.util.privy.CollectionsExt;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.pending.jdk.JDK19;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
+// Specific to the main branch:
+import org.apache.sis.metadata.simple.SimpleAttributeType;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
index ca2e078830,e031ec5241..1f7e043e90
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
@@@ -28,11 -28,11 +28,11 @@@ import org.apache.sis.xml.IdentifierMap
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.ValueConverter;
import org.apache.sis.util.resources.Messages;
- import org.apache.sis.util.privy.CloneAccess;
+ import org.apache.sis.util.internal.shared.CloneAccess;
import org.apache.sis.metadata.iso.citation.Citations;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
index d75499ff48,66299ca3ee..14cf1365d7
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/cat/CodeListUID.java
@@@ -24,11 -24,11 +24,11 @@@ import jakarta.xml.bind.annotation.XmlV
import org.opengis.util.CodeList;
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.bind.Context;
- import static org.apache.sis.metadata.privy.ImplementationHelper.ISO_NAMESPACE;
+ import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ISO_NAMESPACE;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
-import org.opengis.annotation.ResourceBundles;
+// Specific to the main branch:
+import java.util.ResourceBundle;
- import org.apache.sis.util.privy.CodeLists;
++import org.apache.sis.util.internal.shared.CodeLists;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
index 317af7172e,926abc0ced..e4a4bb842c
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
@@@ -21,11 -21,11 +21,11 @@@ import jakarta.xml.bind.annotation.XmlE
import jakarta.xml.bind.annotation.XmlElements;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.sis.xml.bind.Context;
- import org.apache.sis.util.privy.Strings;
- import static org.apache.sis.xml.privy.LegacyNamespaces.VERSION_3_0;
+ import org.apache.sis.util.internal.shared.Strings;
+ import static org.apache.sis.xml.internal.shared.LegacyNamespaces.VERSION_3_0;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.temporal.Period;
+// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.Period;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
index c8f349f4df,d61cc24d6a..ee56e1dc36
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/Parameter.java
@@@ -22,12 -22,11 +22,12 @@@ import org.opengis.metadata.Identifier
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.metadata.simple.SimpleIdentifiedObject;
- import org.apache.sis.metadata.privy.ReferencingServices;
+ import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.util.ComparisonMode;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.apache.sis.util.Utilities.deepEquals;
+// Specific to the main branch:
+import java.util.Set;
+import javax.measure.Unit;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
index feb608a93c,9f929399a0..07ff820e05
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
@@@ -36,8 -36,11 +36,8 @@@ import org.apache.sis.util.iso.Names
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Optional;
-import org.opengis.coverage.Coverage;
-import org.opengis.metadata.quality.Description;
-import org.opengis.metadata.quality.ValueStructure;
+// Specific to the main branch:
- import org.apache.sis.metadata.privy.ReferencingServices;
++import org.apache.sis.metadata.internal.shared.ReferencingServices;
/**
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
index 280235677e,084b09e67f..d09a56d77b
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
@@@ -38,8 -38,9 +38,8 @@@ import static org.apache.sis.util.inter
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.parameter.ParameterDirection;
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
- import org.apache.sis.metadata.privy.ReferencingServices;
++import org.apache.sis.metadata.internal.shared.ReferencingServices;
/**
diff --cc endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
index 40b2e80ede,66a0ba3003..c8055dae18
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/StyleFactory.java
@@@ -19,12 -19,13 +19,12 @@@ package org.apache.sis.style.se1
import java.net.URI;
import java.awt.Color;
import java.util.Objects;
- import org.apache.sis.feature.privy.AttributeConvention;
+ import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Literal;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.filter.Expression;
+import org.apache.sis.filter.DefaultFilterFactory;
/**
diff --cc endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationTypeAdapter.java
index b2652152c0,0000000000..97e3c7964c
mode 100644,000000..100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationTypeAdapter.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ModifiableLocationTypeAdapter.java
@@@ -1,101 -1,0 +1,101 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.gazetteer;
+
+import java.util.List;
+import java.util.Map;
+import java.util.IdentityHashMap;
+import org.opengis.util.InternationalString;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
++import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
+
+
+/**
+ * Workaround for the lack of {@code LocationType} interface in GeoAPI 3.0.
+ * This workaround will be removed if a future GeoAPI version publish that interface,
+ * or if {@link AbstractLocationType} is made public.
+ */
+final class ModifiableLocationTypeAdapter extends ModifiableLocationType {
+ /**
+ * The reference system of the original type.
+ * This is the only information not stored in {@link ModifiableLocationType}.
+ */
+ private final ReferencingByIdentifiers referenceSystem;
+
+ /**
+ * Copies all information from the given type.
+ */
+ private ModifiableLocationTypeAdapter(final AbstractLocationType type,
+ final Map<AbstractLocationType,ModifiableLocationTypeAdapter> previous)
+ {
+ super(type.getName());
+ setTheme(type.getTheme());
+ setDefinition(type.getDefinition());
+ setTerritoryOfUse(type.getTerritoryOfUse());
+ setOwner(type.getOwner());
+ for (final InternationalString s : type.getIdentifications()) {
+ addIdentification(s);
+ }
+ referenceSystem = type.getReferenceSystem();
+ for (final AbstractLocationType c : type.getChildren()) {
+ ModifiableLocationTypeAdapter p = previous.get(c);
+ if (p == null) {
+ p = new ModifiableLocationTypeAdapter(c, previous);
+ previous.put(c, p);
+ }
+ p.addParent(this);
+ }
+ }
+
+ /**
+ * Returns type type as-is if it is already an instance of {@code ModifiableLocationType},
+ * or returns a copy otherwise.
+ */
+ static ModifiableLocationType copy(final AbstractLocationType type) {
+ if (type instanceof ModifiableLocationType) {
+ return (ModifiableLocationType) type;
+ } else {
+ return new ModifiableLocationTypeAdapter(type,
+ new IdentityHashMap<AbstractLocationType,ModifiableLocationTypeAdapter>());
+ }
+ }
+
+ /**
+ * Copies a list of location types.
+ */
+ static List<ModifiableLocationType> copy(final List<? extends AbstractLocationType> types) {
+ final Map<AbstractLocationType,ModifiableLocationTypeAdapter> previous = new IdentityHashMap<>();
+ final ModifiableLocationType[] nt = new ModifiableLocationType[types.size()];
+ for (int i=0; i<nt.length; i++) {
+ final AbstractLocationType c = types.get(i);
+ ModifiableLocationTypeAdapter p = previous.get(c);
+ if (p == null) {
+ p = new ModifiableLocationTypeAdapter(c, previous);
+ previous.put(c, p);
+ }
+ nt[i] = p;
+ }
+ return UnmodifiableArrayList.wrap(nt);
+ }
+
+ /**
+ * Returns the reference system of the type given to the constructor.
+ */
+ @Override
+ public ReferencingByIdentifiers getReferenceSystem() {
+ return referenceSystem;
+ }
+}
diff --cc endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index 961192ade7,07469b8e1e..9fa0d985cd
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@@ -40,13 -40,17 +40,13 @@@ import org.apache.sis.io.wkt.ElementKin
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.citation.Citations;
- import org.apache.sis.referencing.privy.WKTUtilities;
+ import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.system.Modules;
- import org.apache.sis.util.privy.Constants;
+ import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-import org.opengis.metadata.citation.Party;
-import org.opengis.referencing.gazetteer.Location;
-import org.opengis.referencing.gazetteer.LocationType;
-import org.opengis.referencing.gazetteer.ReferenceSystemUsingIdentifiers;
+// Specific to the main branch:
+import org.apache.sis.metadata.iso.citation.AbstractParty;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/module-info.java
index e8d927dbaf,1f07a76f22..fdde484db2
--- a/endorsed/src/org.apache.sis.referencing/main/module-info.java
+++ b/endorsed/src/org.apache.sis.referencing/main/module-info.java
@@@ -30,9 -30,12 +30,9 @@@ module org.apache.sis.referencing
requires transitive java.desktop;
requires transitive org.apache.sis.metadata;
- provides org.apache.sis.metadata.sql.privy.Initializer
+ provides org.apache.sis.metadata.sql.internal.shared.Initializer
with org.apache.sis.referencing.internal.DatabaseListener;
- provides org.opengis.referencing.RegisterOperations
- with org.apache.sis.referencing.MultiRegisterOperations;
-
provides org.opengis.referencing.crs.CRSFactory
with org.apache.sis.referencing.factory.GeodeticObjectFactory;
@@@ -172,9 -175,10 +172,9 @@@
exports org.apache.sis.referencing.operation.matrix;
exports org.apache.sis.referencing.operation.transform;
- exports org.apache.sis.referencing.privy to
+ exports org.apache.sis.referencing.internal.shared to
org.apache.sis.referencing.gazetteer,
org.apache.sis.feature,
- org.apache.sis.geometry, // In the "incubator" sub-project.
org.apache.sis.storage,
org.apache.sis.storage.sql,
org.apache.sis.storage.netcdf,
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
index 13be0b558b,b9b841a463..d007e88054
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
@@@ -34,10 -34,11 +34,10 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
-import org.opengis.coordinate.MismatchedDimensionException;
-import org.opengis.coordinate.MismatchedCoordinateMetadataException;
+import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.metadata.extent.GeographicBoundingBox;
- import org.apache.sis.referencing.privy.TemporalAccessor;
- import org.apache.sis.referencing.privy.AxisDirections;
+ import org.apache.sis.referencing.internal.shared.TemporalAccessor;
+ import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.util.ArgumentCheckByAssertion;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.CRS;
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 2fec89fa71,0a2a07b161..5cdff6f346
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@@ -81,12 -81,12 +81,12 @@@ import org.apache.sis.metadata.simple.S
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.AbstractIdentifiedObject;
-import org.apache.sis.referencing.DefaultObjectDomain;
import org.apache.sis.referencing.ImmutableIdentifier;
+import org.apache.sis.referencing.DefaultObjectDomain;
- import org.apache.sis.referencing.privy.WKTKeywords;
- import org.apache.sis.referencing.privy.WKTUtilities;
import org.apache.sis.referencing.internal.Epoch;
import org.apache.sis.referencing.internal.Resources;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTUtilities;
import org.apache.sis.geometry.AbstractDirectPosition;
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.xml.NilObject;
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
index b2ca558d4a,b7b8f36dc0..faf5566c7d
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
@@@ -47,10 -47,6 +47,10 @@@ import org.apache.sis.math.DecimalFunct
import org.apache.sis.measure.UnitFormat;
import org.apache.sis.measure.Units;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.CoordinateOperations;
++import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.operation.transform.MathTransformBuilder;
+
/**
* Well Known Text (WKT) parser for {@linkplain MathTransform math transform}s.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
index e8a54ea7be,389ad65012..5aac8dc05f
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
@@@ -59,10 -59,10 +59,10 @@@ import org.apache.sis.util.internal.sha
import org.apache.sis.system.Loggers;
import org.apache.sis.temporal.LenientDateFormat;
import org.apache.sis.referencing.ImmutableIdentifier;
- import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
+ import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.apache.sis.metadata.iso.DefaultIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index b3cb0482fb,5f4572a82e..f870163e27
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -79,10 -79,8 +79,10 @@@ import org.opengis.referencing.Referenc
import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.Projection;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceSystem;
- import org.apache.sis.metadata.iso.DefaultIdentifier;
+import org.apache.sis.referencing.internal.Legacy;
++import org.apache.sis.metadata.iso.DefaultIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index b2eec3b12e,a462affe0d..1ff3291caf
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@@ -86,13 -86,11 +86,13 @@@ import org.apache.sis.util.logging.Logg
import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
- import static org.apache.sis.util.privy.Constants.SECONDS_PER_DAY;
+ import static org.apache.sis.util.internal.shared.Constants.SECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.referencing.datum.RealizationMethod;
+// Specific to the main branch:
+import org.opengis.referencing.crs.GeocentricCRS;
+import org.opengis.referencing.datum.VerticalDatumType;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+import static org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index a67a8e3916,0c31baecea..341a46bf3a
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@@ -74,12 -74,12 +74,12 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
- import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
+ import static org.apache.sis.metadata.internal.shared.ReferencingServices.AUTHALIC_RADIUS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.referencing.datum.RealizationMethod;
-import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
+// Specific to the main branch:
+import org.opengis.referencing.datum.VerticalDatumType;
+import static org.opengis.referencing.datum.Datum.DOMAIN_OF_VALIDITY_KEY;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
index d1276f17e8,4b23a3ebda..a44829fdcd
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
@@@ -32,11 -32,11 +32,11 @@@ import org.apache.sis.referencing.Ident
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
- import org.apache.sis.metadata.privy.ImplementationHelper;
+ import org.apache.sis.metadata.internal.shared.ImplementationHelper;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
index 01924478c0,ac51cf8840..2b7ceac5c3
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
@@@ -37,15 -37,15 +37,15 @@@ import org.apache.sis.referencing.cs.Ax
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Longitude;
- import static org.apache.sis.util.privy.Constants.CRS;
- import static org.apache.sis.util.privy.Constants.EPSG;
- import static org.apache.sis.util.privy.Constants.CRS27;
- import static org.apache.sis.util.privy.Constants.CRS83;
- import static org.apache.sis.util.privy.Constants.CRS84;
+ import static org.apache.sis.util.internal.shared.Constants.CRS;
+ import static org.apache.sis.util.internal.shared.Constants.EPSG;
+ import static org.apache.sis.util.internal.shared.Constants.CRS27;
+ import static org.apache.sis.util.internal.shared.Constants.CRS83;
+ import static org.apache.sis.util.internal.shared.Constants.CRS84;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
index 31008d9de8,cfa269935c..c2fed716e1
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java
@@@ -20,15 -20,18 +20,15 @@@ import java.util.Map
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.cs.AbstractCS;
-import org.apache.sis.referencing.datum.DefaultParametricDatum;
import org.apache.sis.io.wkt.Formatter;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.cs.ParametricCS;
-import org.opengis.referencing.crs.ParametricCRS;
-import org.opengis.referencing.datum.ParametricDatum;
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.apache.sis.referencing.datum.DatumOrEnsemble;
+// Specific to the main branch:
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
index 00fdf2a5b5,e5ceb2785b..3fb1406917
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
@@@ -28,11 -28,11 +28,11 @@@ import org.apache.sis.referencing.cs.Ax
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultVerticalDatum;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
+// Specific to the main branch:
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
index 1d87227402,8ec36c70c4..1dccb0152a
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DynamicCRS.java
@@@ -21,11 -21,10 +21,11 @@@ import org.opengis.referencing.datum.Da
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.referencing.internal.Epoch;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DynamicReferenceFrame;
+// Specific to the main branch:
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
+import org.apache.sis.referencing.datum.DefaultVerticalDatum;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultTimeCS.java
index 91d9b5f54d,f4a44d6a5c..c77116b998
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultTimeCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultTimeCS.java
@@@ -23,9 -23,12 +23,9 @@@ import javax.measure.Unit
import org.opengis.referencing.cs.TimeCS;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystemAxis;
- import org.apache.sis.referencing.privy.AxisDirections;
+ import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.cs.CoordinateDataType;
-
/**
* A 1-dimensional coordinate system for time elapsed in the specified time units from a specified time origin.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
index dc807bd6aa,9cda8728df..297dd2428b
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@@ -53,14 -53,14 +53,14 @@@ import org.apache.sis.io.wkt.ElementKin
import org.apache.sis.io.wkt.Formatter;
import static org.apache.sis.util.Utilities.deepEquals;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.ImageDatum;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.referencing.datum.DynamicReferenceFrame;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.metadata.extent.Extent;
+import org.apache.sis.referencing.internal.Legacy;
- // Specific to the geoapi-3.1 and geoapi-4.0 branches:
- import org.opengis.referencing.datum.ImageDatum;
-
/**
* Specifies the relationship of a Coordinate System to the earth.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
index 8961fe46e8,0c2e3fb653..fa8ce4f809
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
@@@ -22,11 -22,11 +22,11 @@@ import jakarta.xml.bind.annotation.XmlR
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.opengis.referencing.datum.EngineeringDatum;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java
index 98aeaf24a8,6ac0688340..ab7461f32a
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultParametricDatum.java
@@@ -19,9 -19,12 +19,9 @@@ package org.apache.sis.referencing.datu
import java.util.Map;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.io.wkt.Formatter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.ParametricDatum;
-
/**
* Defines the origin of a parametric coordinate reference system.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index 5889f96778,87db55f410..bf68caf116
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@@ -30,11 -30,8 +30,11 @@@ import org.opengis.metadata.extent.Exte
import org.opengis.util.FactoryException;
import org.opengis.util.InternationalString;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
+// Specific to the main branch:
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+
/**
* Delegates object creations to one of the {@code create} methods in a backing {@code AuthorityFactory}.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
index 041b1402d3,00b9316bd2..ecca3e11ac
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
@@@ -25,15 -25,8 +25,15 @@@ import org.opengis.referencing.crs.*
import org.opengis.referencing.datum.*;
import org.opengis.referencing.operation.*;
import org.opengis.parameter.ParameterDescriptor;
- import org.apache.sis.referencing.privy.WKTKeywords;
+ import org.apache.sis.referencing.internal.shared.WKTKeywords;
+// Specific to the main branch:
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.crs.DefaultParametricCRS;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+
/**
* Information (such as columns of particular interest) about a specific <abbr>EPSG</abbr> table.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index d121506940,d3270da7cd..e547d026c1
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
@@@ -27,33 -27,8 +27,33 @@@ import org.apache.sis.referencing.Commo
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.cs.DefaultCartesianCS;
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
- import org.apache.sis.referencing.privy.ReferencingUtilities;
+ import org.apache.sis.referencing.internal.shared.ReferencingUtilities;
+// Specific to the main branch:
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Collection;
+import java.time.Instant;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.temporal.Temporal;
+import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
+
/**
* Utilities related to version 1 of Well Known Text format, or to ISO 19111:2007.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index 9c7e99fead,8daa914999..86288ec7e6
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@@ -46,7 -46,6 +46,7 @@@ import org.apache.sis.geometry.Envelope
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.CoordinateFormat;
- import org.apache.sis.metadata.privy.ReferencingServices;
++import org.apache.sis.metadata.internal.shared.ReferencingServices;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.IdentifiedObjects;
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index c0fc47012b,1b4a922b41..0cb041d701
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@@ -24,8 -24,8 +24,8 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.util.Characters;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.internal.shared.CodeLists;
import org.apache.sis.measure.Units;
- import org.apache.sis.util.privy.CodeLists;
++import org.apache.sis.util.internal.shared.CodeLists;
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.datum.VerticalDatumType;
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java
index 3f31682830,979facb67f..70cd82cf9c
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/ReferencingUtilities.java
@@@ -50,14 -50,6 +50,14 @@@ import org.apache.sis.referencing.inter
import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
+// Specific to the main branch:
+import java.util.Collection;
+import java.util.NoSuchElementException;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.pending.geoapi.referencing.MissingMethods;
- import org.apache.sis.metadata.privy.Identifiers;
++import org.apache.sis.metadata.internal.shared.Identifiers;
+import org.apache.sis.xml.NilObject;
+
/**
* A set of static methods working on GeoAPI referencing objects.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java
index c610643d16,6628a7f5c2..0308b7c53b
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/MathTransformContext.java
@@@ -36,14 -37,13 +37,13 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.provider.Affine;
import org.apache.sis.referencing.operation.transform.ContextualParameters.MatrixRole;
- import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.parameter.TensorParameters;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.Constants;
+ import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.UnimplementedServiceException;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.CoordinateOperations;
++import org.apache.sis.referencing.internal.shared.CoordinateOperations;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
index 31d196603d,e78488d300..315092643e
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
@@@ -34,14 -34,14 +34,14 @@@ import org.apache.sis.util.internal.sha
import org.apache.sis.math.DecimalFunctions;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.pending.jdk.JDK21;
- import org.apache.sis.referencing.privy.AxisDirections;
- import org.apache.sis.referencing.privy.ExtendedPrecisionMatrix;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.Arithmetic;
+ import org.apache.sis.referencing.internal.shared.AxisDirections;
+ import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix;
import org.apache.sis.referencing.operation.transform.MathTransforms; // For javadoc
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
index f76f2b0150,bacb50145a..22d979b08d
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
@@@ -48,13 -48,13 +48,13 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.referencing.operation.transform.DomainDefinition;
import org.apache.sis.referencing.operation.transform.TransformJoiner;
import org.apache.sis.referencing.operation.provider.MapProjection;
- import org.apache.sis.referencing.privy.Formulas;
+ import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.system.Modules;
- import org.apache.sis.util.privy.Constants;
- import org.apache.sis.util.privy.Numerics;
+ import org.apache.sis.util.internal.shared.Constants;
+ import org.apache.sis.util.internal.shared.Numerics;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformBuilder.java
index 77e7477225,3d1fe49b68..656ebfc962
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformBuilder.java
@@@ -46,9 -46,6 +46,9 @@@ import org.apache.sis.referencing.inter
import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.CoordinateOperations;
++import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+
/**
* Builder of transforms between coordinate systems.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
index 1b15e02d65,b355f5f2d8..c168578bab
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
@@@ -23,14 -23,8 +23,14 @@@ import org.opengis.referencing.operatio
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.util.Classes;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
+// Specific to the main branch:
+import org.opengis.util.FactoryException;
+import org.opengis.referencing.datum.Ellipsoid;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.parameter.ParameterValueGroup;
+
/**
* Builder of a parameterized math transform using a method identified by a name or code.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
index 0564d0c7a9,150c169fca..9a497db2ff
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
@@@ -41,10 -41,10 +41,10 @@@ import org.apache.sis.util.OptionalCand
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Static;
- import org.apache.sis.util.privy.DoubleDouble;
+ import org.apache.sis.util.internal.shared.DoubleDouble;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
index aaf43b9b33,195a964805..0ed2e01c31
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/TransliteratorTest.java
@@@ -28,9 -28,6 +28,9 @@@ import static org.junit.jupiter.api.Ass
import org.apache.sis.test.TestCase;
import org.apache.sis.test.mock.CoordinateSystemAxisMock;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.AxisDirections;
++import org.apache.sis.referencing.internal.shared.AxisDirections;
+
/**
* Tests the {@link Transliterator} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 5d48afeb64,ca88f61380..375f8875aa
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@@ -29,11 -29,11 +29,11 @@@ import static java.lang.StrictMath.*
import net.sf.geographiclib.Geodesic;
import net.sf.geographiclib.GeodesicData;
import org.opengis.geometry.DirectPosition;
+import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
- import org.apache.sis.referencing.privy.Formulas;
- import org.apache.sis.referencing.privy.ShapeUtilitiesExt;
-import org.opengis.referencing.cs.AxisDirection;
+ import org.apache.sis.referencing.internal.shared.Formulas;
+ import org.apache.sis.referencing.internal.shared.ShapeUtilitiesExt;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.util.CharSequences;
import org.apache.sis.math.StatisticsFormat;
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index ec240fd61c,0b44ba6140..0b45748cee
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@@ -26,9 -26,8 +26,9 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.AxisDirections;
++import org.apache.sis.referencing.internal.shared.AxisDirections;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index 17c96d7cb5,bb21729e08..c495b6f29b
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@@ -26,9 -26,8 +26,9 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.AxisDirections;
++import org.apache.sis.referencing.internal.shared.AxisDirections;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index 0022abe341,4aadf4bb69..aca7486336
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@@ -24,9 -24,8 +24,9 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.AxisDirections;
++import org.apache.sis.referencing.internal.shared.AxisDirections;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
index bffb391065,b81a702289..e9e8e71453
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/HardCodedAxes.java
@@@ -20,12 -20,9 +20,12 @@@ import java.util.HashMap
import javax.measure.Unit;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.RangeMeaning;
- import org.apache.sis.metadata.privy.AxisNames;
+ import org.apache.sis.metadata.internal.shared.AxisNames;
import org.apache.sis.measure.Units;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.AxisDirections;
++import org.apache.sis.referencing.internal.shared.AxisDirections;
+
/**
* Collection of axes for testing purpose.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/shared/AxisDirectionsTest.java
index 29672463ff,86c32b36c1..132e61e15e
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/shared/AxisDirectionsTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/shared/AxisDirectionsTest.java
@@@ -32,13 -32,6 +32,13 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.TestCase;
+// Specific to the main branch:
- import static org.apache.sis.referencing.privy.AxisDirections.TOWARDS;
- import static org.apache.sis.referencing.privy.AxisDirections.AWAY_FROM;
- import static org.apache.sis.referencing.privy.AxisDirections.CLOCKWISE;
- import static org.apache.sis.referencing.privy.AxisDirections.COUNTER_CLOCKWISE;
- import static org.apache.sis.referencing.privy.AxisDirections.UNSPECIFIED;
++import static org.apache.sis.referencing.internal.shared.AxisDirections.TOWARDS;
++import static org.apache.sis.referencing.internal.shared.AxisDirections.AWAY_FROM;
++import static org.apache.sis.referencing.internal.shared.AxisDirections.CLOCKWISE;
++import static org.apache.sis.referencing.internal.shared.AxisDirections.COUNTER_CLOCKWISE;
++import static org.apache.sis.referencing.internal.shared.AxisDirections.UNSPECIFIED;
+
/**
* Tests the {@link AxisDirections} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index ff36fc37ad,341ed42f68..39070752a3
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@@ -38,8 -38,10 +38,8 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Arrays;
-import org.opengis.test.ToleranceModifier;
-import org.apache.sis.referencing.datum.HardCodedDatum;
+// Specific to the main branch:
- import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.referencing.internal.shared.CoordinateOperations.builder;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
index 5ed6a89ae4,93dfaa840d..3a9d4bb0fc
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
@@@ -30,9 -30,8 +30,9 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
- import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.referencing.internal.shared.CoordinateOperations.builder;
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index 1af6bb6bae,fa1e1504d2..088284e86d
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@@ -49,9 -49,8 +49,9 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.test.Assertions.assertMessageContains;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
- import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.referencing.internal.shared.CoordinateOperations.builder;
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 72ee28d56f,df94e4a87c..85094f4d75
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@@ -39,8 -39,18 +39,8 @@@ import org.apache.sis.referencing.datum
import org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolationTest;
import org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.io.IOException;
-import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.referencing.operation.provider.AbridgedMolodensky;
-import org.apache.sis.math.StatisticsFormat;
-import org.apache.sis.math.Statistics;
-import static org.apache.sis.metadata.internal.shared.ReferencingServices.NAUTICAL_MILE;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
-import org.opengis.test.ToleranceModifiers;
-import org.opengis.test.referencing.ParameterizedTransformTest;
-import org.apache.sis.test.TestCase;
+// Specific to the main branch:
- import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.referencing.internal.shared.CoordinateOperations.builder;
/**
diff --cc endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
index 85e1982899,dc0bae3650..a240e19787
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
@@@ -62,13 -62,12 +62,13 @@@ import org.apache.sis.referencing.inter
import org.apache.sis.referencing.operation.provider.PolarStereographicB;
import org.apache.sis.referencing.operation.provider.TransverseMercator;
import org.apache.sis.storage.base.MetadataBuilder;
- import org.apache.sis.util.privy.Constants;
- import org.apache.sis.util.privy.Strings;
- import static org.apache.sis.util.privy.CollectionsExt.singletonOrNull;
+ import org.apache.sis.util.internal.shared.Constants;
+ import org.apache.sis.util.internal.shared.Strings;
+ import static org.apache.sis.util.internal.shared.CollectionsExt.singletonOrNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.MathTransform;
+// Specific to the main branch:
- import org.apache.sis.referencing.privy.CoordinateOperations;
++import org.apache.sis.referencing.internal.shared.CoordinateOperations;
+import org.apache.sis.referencing.operation.transform.MathTransformBuilder;
/**
diff --cc endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index 8d44ab37f0,ae58fee855..321ee29f40
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@@ -47,10 -47,13 +47,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.logging.PerformanceLevel;
import org.apache.sis.util.collection.TreeTable;
- import org.apache.sis.util.privy.Constants;
+ import org.apache.sis.util.internal.shared.Constants;
import org.apache.sis.util.iso.DefaultNameFactory;
- import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
+ import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.NameFactory;
-
/**
* The API used internally by Apache SIS for fetching variables and attribute values from a netCDF file.
diff --cc endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
index 40adc12d3c,c2203eeb84..7c80308b9d
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
@@@ -24,15 -24,15 +24,15 @@@ import java.sql.Statement
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
- import org.apache.sis.metadata.sql.privy.SQLBuilder;
- import org.apache.sis.feature.privy.FeatureProjection;
+ import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
+ import org.apache.sis.feature.internal.shared.FeatureProjection;
import org.apache.sis.util.collection.WeakValueHashMap;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.SortOrder;
-import org.opengis.filter.SortProperty;
-import org.opengis.filter.SortBy;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.SortOrder;
+import org.apache.sis.pending.geoapi.filter.SortProperty;
+import org.apache.sis.pending.geoapi.filter.SortBy;
/**
diff --cc endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
index 8db3036703,e4b9294b77..2f0f354deb
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
@@@ -39,12 -39,12 +39,12 @@@ import org.apache.sis.util.internal.sha
import org.apache.sis.util.stream.DeferredStream;
import org.apache.sis.util.stream.PaginedStream;
import org.apache.sis.storage.DataStoreException;
- import org.apache.sis.feature.privy.FeatureProjection;
+ import org.apache.sis.feature.internal.shared.FeatureProjection;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.filter.Filter;
-import org.opengis.filter.SortBy;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.SortBy;
/**
diff --cc endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
index ebf56d582a,18ff76ad40..13afe1d755
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
@@@ -24,21 -24,22 +24,21 @@@ import java.sql.Connection
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
- import org.apache.sis.filter.privy.FunctionNames;
- import org.apache.sis.filter.privy.Visitor;
+ import org.apache.sis.filter.internal.shared.FunctionNames;
+ import org.apache.sis.filter.internal.shared.Visitor;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.CodeList;
-import org.opengis.feature.Feature;
-import org.opengis.filter.Filter;
-import org.opengis.filter.Literal;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
-import org.opengis.filter.LogicalOperator;
-import org.opengis.filter.LogicalOperatorName;
-import org.opengis.filter.ComparisonOperatorName;
-import org.opengis.filter.BinaryComparisonOperator;
-import org.opengis.filter.SpatialOperatorName;
-import org.opengis.filter.BetweenComparisonOperator;
+// Specific to the main branch:
+import org.apache.sis.filter.Filter;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.Literal;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
+import org.apache.sis.pending.geoapi.filter.LogicalOperator;
+import org.apache.sis.pending.geoapi.filter.LogicalOperatorName;
+import org.apache.sis.pending.geoapi.filter.ComparisonOperatorName;
+import org.apache.sis.pending.geoapi.filter.BinaryComparisonOperator;
+import org.apache.sis.pending.geoapi.filter.SpatialOperatorName;
+import org.apache.sis.pending.geoapi.filter.BetweenComparisonOperator;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
index e2adb3ba26,dbafaf4e76..32e1e9ac2c
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
@@@ -31,13 -31,13 +31,13 @@@ import org.apache.sis.storage.Resource
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.BackingStoreException;
- import org.apache.sis.util.privy.CollectionsExt;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.CollectionsExt;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.storage.internal.Resources;
-// 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 endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
index bab29f55ad,9649c38087..87eadd8736
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
@@@ -33,11 -33,11 +33,11 @@@ import org.apache.sis.storage.internal.
import org.apache.sis.storage.base.MemoryGridResource;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.logging.Logging;
- import org.apache.sis.util.privy.Numerics;
- import static org.apache.sis.image.privy.ImageUtilities.LOGGER;
+ import org.apache.sis.util.internal.shared.Numerics;
+ import static org.apache.sis.image.internal.shared.ImageUtilities.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
index 709decc86b,9832092f16..519664054f
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
@@@ -29,10 -29,10 +29,10 @@@ import org.apache.sis.util.internal.sha
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.lineage.DefaultSource;
import org.apache.sis.metadata.iso.maintenance.DefaultScope;
- import static org.apache.sis.util.privy.CollectionsExt.nonNull;
+ import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.MetadataScope;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
/**
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
index 070d408be1,4d5dceb768..aaf0dcb48c
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
@@@ -26,14 -26,14 +26,14 @@@ import java.time.Instant
import org.apache.sis.math.Vector;
import org.apache.sis.geometry.wrapper.Dimensions;
import org.apache.sis.geometry.wrapper.Geometries;
- import org.apache.sis.feature.privy.MovingFeatures;
+ import org.apache.sis.feature.internal.shared.MovingFeatures;
import org.apache.sis.storage.internal.Resources;
import org.apache.sis.util.CorruptedObjectException;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Attribute;
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractAttribute;
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
index 6f7b5f8e80,e2e823b718..c6896950ae
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
@@@ -23,12 -23,12 +23,12 @@@ import java.text.ParsePosition
import org.opengis.util.GenericName;
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.util.resources.Vocabulary;
- import org.apache.sis.util.privy.Strings;
- import org.apache.sis.util.privy.Constants;
- import org.apache.sis.util.privy.MetadataServices;
+ import org.apache.sis.util.internal.shared.Strings;
+ import org.apache.sis.util.internal.shared.Constants;
+ import org.apache.sis.util.internal.shared.MetadataServices;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
index 51246bac37,d6a3cdca40..4b85c08a5c
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
@@@ -21,13 -21,13 +21,13 @@@ import java.util.function.DoubleUnaryOp
import static java.lang.Double.*;
import org.opengis.geometry.DirectPosition;
import org.apache.sis.util.ArgumentChecks;
- import org.apache.sis.util.privy.DoubleDouble;
- import org.apache.sis.util.privy.Numerics;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.DoubleDouble;
+ import org.apache.sis.util.internal.shared.Numerics;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
index aa1ee48607,da4e5fef26..4537c6f685
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
@@@ -25,13 -25,13 +25,13 @@@ import static java.lang.Math.sqrt
import static java.lang.Math.ulp;
import org.opengis.geometry.DirectPosition;
import org.apache.sis.util.ArgumentChecks;
- import org.apache.sis.util.privy.DoubleDouble;
- import org.apache.sis.util.privy.Numerics;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.DoubleDouble;
+ import org.apache.sis.util.internal.shared.Numerics;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java
index 2d413d4a9d,2028b03486..89b60a2d0e
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java
@@@ -24,11 -24,12 +24,11 @@@ import org.opengis.referencing.crs.Coor
import org.opengis.referencing.operation.MathTransform;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.DirectPosition;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
-import org.opengis.coverage.grid.GridEnvelope;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
index 432b03b807,5ae3c3bf2f..ca578ff283
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/CodeListSet.java
@@@ -24,12 -24,9 +24,12 @@@ import java.util.NoSuchElementException
import java.io.Serializable;
import java.lang.reflect.Modifier;
import org.opengis.util.CodeList;
- import org.apache.sis.util.privy.CheckedArrayList;
+ import org.apache.sis.util.internal.shared.CheckedArrayList;
import org.apache.sis.util.resources.Errors;
+// Specific to the main branch:
- import org.apache.sis.util.privy.CodeLists;
++import org.apache.sis.util.internal.shared.CodeLists;
+
/**
* A specialized {@code Set} implementation for use with {@link CodeList} values.
diff --cc netbeans-project/nbproject/project.properties
index c9e459120b,a14465049c..533fdfb80f
--- a/netbeans-project/nbproject/project.properties
+++ b/netbeans-project/nbproject/project.properties
@@@ -115,14 -115,15 +115,14 @@@ test.options = --add-modules jama,Geogr
--add-exports org.apache.sis.metadata/org.apache.sis.test.mock=${modules.list} \
--add-exports org.apache.sis.metadata/org.apache.sis.metadata.xml=org.apache.sis.storage \
--add-exports org.apache.sis.metadata/org.apache.sis.xml.test=${modules.list} \
- --add-exports org.apache.sis.metadata/org.apache.sis.xml.privy=org.apache.sis.storage.geotiff \
+ --add-exports org.apache.sis.metadata/org.apache.sis.xml.internal.shared=org.apache.sis.storage.geotiff \
--add-exports org.apache.sis.metadata/org.apache.sis.xml.bind.gcx=org.apache.sis.referencing \
- --add-exports org.apache.sis.metadata/org.apache.sis.metadata.privy=org.apache.sis.referencing.gazetteer \
- --add-exports org.apache.sis.metadata/org.apache.sis.metadata.sql.privy=org.apache.sis.referencing.epsg \
+ --add-exports org.apache.sis.metadata/org.apache.sis.metadata.internal.shared=org.apache.sis.referencing.gazetteer \
+ --add-exports org.apache.sis.metadata/org.apache.sis.metadata.sql.internal.shared=org.apache.sis.referencing.epsg \
--add-exports org.apache.sis.referencing/org.apache.sis.referencing.internal=org.apache.sis.openoffice \
- --add-exports org.apache.sis.feature/org.apache.sis.feature.privy=org.apache.sis.storage.sql \
+ --add-exports org.apache.sis.feature/org.apache.sis.feature.internal.shared=org.apache.sis.storage.sql \
- --add-exports org.apache.sis.feature/org.apache.sis.geometry.wrapper.jts=org.apache.sis.storage.sql,org.apache.sis.portrayal.map \
+ --add-exports org.apache.sis.feature/org.apache.sis.geometry.wrapper.jts=org.apache.sis.storage.sql \
--add-exports org.apache.sis.feature/org.apache.sis.geometry.wrapper=org.apache.sis.storage.geopackage \
- --add-exports org.apache.sis.storage/org.apache.sis.storage.base=org.apache.sis.portrayal.map \
--add-exports org.apache.sis.storage/org.apache.sis.storage.test=${modules.list}
#
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
index 396a4c5c85,80861ca665..eec854a076
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandableList.java
@@@ -31,11 -31,12 +31,11 @@@ import javafx.collections.ListChangeLis
import javafx.collections.transformation.TransformationList;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.gui.internal.Styles;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
index e1957ddf0e,b7080f1f73..5ce9aa63e1
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/FeatureList.java
@@@ -26,10 -26,10 +26,10 @@@ import javafx.concurrent.Worker
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.util.ArraysExt;
- import org.apache.sis.util.privy.UnmodifiableArrayList;
+ import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
index 3a2f69b87e,10c3de3a84..aa61230249
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java
@@@ -89,10 -89,10 +89,10 @@@ import org.apache.sis.portrayal.PlanarC
import org.apache.sis.portrayal.RenderException;
import org.apache.sis.portrayal.TransformChangeEvent;
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
- import static org.apache.sis.util.privy.Constants.NANOS_PER_MILLISECOND;
+ import static org.apache.sis.util.internal.shared.Constants.NANOS_PER_MILLISECOND;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
index 6f4a816283,31fde13778..b55ce37fc2
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/ValuesFormatter.java
@@@ -42,11 -42,11 +42,11 @@@ import org.apache.sis.measure.NumberRan
import org.apache.sis.measure.UnitFormat;
import org.apache.sis.util.Characters;
import org.apache.sis.util.logging.Logging;
- import org.apache.sis.util.privy.Numerics;
+ import org.apache.sis.util.internal.shared.Numerics;
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
index 13e8f60ab0,1853e6d6e0..82e0094236
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/metadata/IdentificationInfo.java
@@@ -60,12 -60,9 +60,12 @@@ import org.apache.sis.util.Workaround
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.resources.Vocabulary;
- import static org.apache.sis.util.privy.CollectionsExt.nonNull;
+ import static org.apache.sis.util.internal.shared.CollectionsExt.nonNull;
import static org.apache.sis.gui.internal.LogHandler.LOGGER;
+// Specific to the main branch:
+import org.opengis.metadata.identification.DataIdentification;
+
/**
* The pane where to show the values of {@link Identification} objects.
diff --cc optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/FeatureLayer.java
index bd6dc7a357,0bbb5e6237..0e89f30779
--- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/FeatureLayer.java
+++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/FeatureLayer.java
@@@ -39,11 -39,11 +39,11 @@@ import org.apache.sis.storage.DataStore
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Workaround;
import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.privy.Strings;
+ import org.apache.sis.util.internal.shared.Strings;
-// 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;
/**