This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git
commit 244bbb14df298d9ee4e79272fb1c17db521cee2a Merge: 3c78638b96 41cf5d3399 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Wed Jul 19 10:24:51 2023 +0200 Merge branch 'geoapi-3.1'. The main changes are compiler warning resolutions. .../apache/sis/console/FormattedOutputCommand.java | 2 +- .../org/apache/sis/console/AboutCommandTest.java | 6 + .../org/apache/sis/console/CommandRunnerTest.java | 6 + .../org/apache/sis/console/HelpCommandTest.java | 6 + .../apache/sis/console/MetadataCommandTest.java | 6 + .../apache/sis/console/MimeTypeCommandTest.java | 6 + .../apache/sis/gui/coverage/CoverageCanvasApp.java | 5 + .../sis/gui/coverage/CoverageStylingApp.java | 6 + .../sis/gui/coverage/GridSliceSelectorApp.java | 6 + .../org/apache/sis/gui/coverage/GridViewApp.java | 6 + .../apache/sis/gui/referencing/CRSChooserApp.java | 6 + .../apache/sis/internal/gui/GUIUtilitiesTest.java | 6 + .../internal/gui/control/ValueColorMapperApp.java | 6 + .../sis/openoffice/ReferencingFunctionsTest.java | 6 + .../org/apache/sis/openoffice/TransformerTest.java | 6 + .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 6 + .../sis/coverage/grid/GridCoverageProcessor.java | 2 +- .../java/org/apache/sis/feature/Validator.java | 1 + .../sis/feature/builder/AttributeTypeBuilder.java | 1 + .../java/org/apache/sis/image/ImageProcessor.java | 3 + .../sis/internal/coverage/MultiSourceArgument.java | 13 +- .../internal/feature/jts/GeometryTransform.java | 4 +- .../org/apache/sis/coverage/CategoryListTest.java | 6 + .../java/org/apache/sis/coverage/CategoryTest.java | 6 + .../apache/sis/coverage/CoverageCombinerTest.java | 6 + .../apache/sis/coverage/SampleDimensionTest.java | 6 + .../apache/sis/coverage/SampleRangeFormatTest.java | 6 + .../coverage/grid/BufferedGridCoverageTest.java | 6 + .../coverage/grid/ConvertedGridCoverageTest.java | 6 + .../coverage/grid/DimensionalityReductionTest.java | 6 + .../grid/FractionalGridCoordinatesTest.java | 6 + .../sis/coverage/grid/GridCoverage2DTest.java | 6 + .../sis/coverage/grid/GridCoverageBuilderTest.java | 6 + .../sis/coverage/grid/GridDerivationTest.java | 6 + .../apache/sis/coverage/grid/GridExtentTest.java | 6 + .../apache/sis/coverage/grid/GridGeometryTest.java | 6 + .../sis/coverage/grid/GridOrientationTest.java | 6 + .../sis/coverage/grid/PixelTranslationTest.java | 6 + .../coverage/grid/ResampledGridCoverageTest.java | 6 + .../sis/coverage/grid/ReshapedImageTest.java | 6 + .../coverage/grid/TranslatedGridCoverageTest.java | 6 + .../apache/sis/feature/AbstractFeatureTest.java | 6 + .../apache/sis/feature/AbstractOperationTest.java | 6 + .../apache/sis/feature/CharacteristicMapTest.java | 6 + .../sis/feature/CharacteristicTypeMapTest.java | 6 + .../org/apache/sis/feature/CustomAttribute.java | 3 +- .../sis/feature/DefaultAssociationRoleTest.java | 6 + .../sis/feature/DefaultAttributeTypeTest.java | 6 + .../apache/sis/feature/DefaultFeatureTypeTest.java | 6 + .../org/apache/sis/feature/DenseFeatureTest.java | 6 + .../apache/sis/feature/EnvelopeOperationTest.java | 6 + .../org/apache/sis/feature/FeatureFormatTest.java | 6 + .../apache/sis/feature/FeatureOperationsTest.java | 6 + .../org/apache/sis/feature/FeatureTestCase.java | 14 +- .../java/org/apache/sis/feature/FeaturesTest.java | 6 + .../sis/feature/GroupAsPolylineOperationTest.java | 6 + .../org/apache/sis/feature/LinkOperationTest.java | 6 + .../sis/feature/MultiValuedAttributeTest.java | 6 + .../sis/feature/SingletonAssociationTest.java | 6 + .../apache/sis/feature/SingletonAttributeTest.java | 7 + .../org/apache/sis/feature/SparseFeatureTest.java | 6 + .../sis/feature/StringJoinOperationTest.java | 6 + .../builder/AssociationRoleBuilderTest.java | 6 + .../feature/builder/AttributeTypeBuilderTest.java | 6 + .../builder/CharacteristicTypeBuilderTest.java | 6 + .../feature/builder/FeatureTypeBuilderTest.java | 6 + .../java/org/apache/sis/filter/LikeFilterTest.java | 6 + .../java/org/apache/sis/filter/PeriodLiteral.java | 6 + .../test/java/org/apache/sis/filter/XPathTest.java | 6 + .../org/apache/sis/image/BandSelectImageTest.java | 6 + .../sis/image/BandedSampleConverterTest.java | 6 + .../org/apache/sis/image/ComputedImageTest.java | 6 + .../java/org/apache/sis/image/DataTypeTest.java | 6 + .../org/apache/sis/image/ImageCombinerTest.java | 6 + .../org/apache/sis/image/InterpolationTest.java | 6 + .../java/org/apache/sis/image/MaskedImageTest.java | 6 + .../java/org/apache/sis/image/PlanarImageTest.java | 6 + .../org/apache/sis/image/ResampledImageTest.java | 6 + .../org/apache/sis/image/ResamplingGridTest.java | 6 + .../apache/sis/index/tree/PointTreeNodeTest.java | 6 + .../org/apache/sis/index/tree/PointTreeTest.java | 6 + .../sis/internal/coverage/RangeArgumentTest.java | 6 + .../coverage/j2d/ColorModelBuilderTest.java | 6 + .../sis/internal/coverage/j2d/ImageLayoutTest.java | 6 + .../internal/coverage/j2d/ImageUtilitiesTest.java | 6 + .../coverage/j2d/SampleModelFactoryTest.java | 6 + .../internal/feature/AttributeConventionTest.java | 6 + .../sis/internal/feature/GeometryTypeTest.java | 6 + .../sis/internal/feature/j2d/FlatShapeTest.java | 6 + .../internal/feature/j2d/ShapePropertiesTest.java | 6 + .../apache/sis/internal/feature/jts/JTSTest.java | 6 + .../sis/internal/filter/FunctionNamesTest.java | 6 + .../internal/processing/isoline/IsolinesTest.java | 6 + ...peProperties.java => FinalClassExtensions.java} | 72 ++++--- .../apache/sis/internal/jaxb/gco/GO_Boolean.java | 2 +- .../sis/internal/jaxb/gco/GO_CharacterString.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Integer.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Integer64.java | 2 +- .../apache/sis/internal/jaxb/gco/GO_Record.java | 2 +- .../apache/sis/internal/jaxb/gco/Multiplicity.java | 3 +- .../apache/sis/internal/jaxb/gco/NameValue.java | 7 + .../apache/sis/internal/jaxb/gco/PropertyType.java | 7 +- .../apache/sis/internal/jaxb/gco/UnitAdapter.java | 7 +- .../sis/internal/jaxb/geometry/ObjectFactory.java | 6 + .../sis/internal/metadata/MetadataTypes.java | 6 + .../internal/metadata/TransformationAccuracy.java | 1 + .../DefaultFeatureCatalogueDescription.java | 5 +- .../iso/content/DefaultImageDescription.java | 5 +- .../metadata/iso/distribution/DefaultDataFile.java | 1 + .../iso/extent/AbstractGeographicExtent.java | 6 +- .../iso/extent/DefaultGeographicBoundingBox.java | 21 +- .../sis/metadata/iso/quality/AbstractElement.java | 1 + .../iso/quality/AbstractTemporalQuality.java | 1 + .../metadata/iso/quality/DefaultDataQuality.java | 1 + ...DefaultNonQuantitativeAttributeCorrectness.java | 1 + .../iso/quality/DefaultQuantitativeResult.java | 1 + .../org/apache/sis/metadata/sql/Dispatcher.java | 2 +- .../main/java/org/apache/sis/xml/NilReason.java | 223 ++++++++++++++------- .../internal/jaxb/IdentifierMapAdapterTest.java | 6 + .../internal/jaxb/ModifiableIdentifierMapTest.java | 6 + .../internal/jaxb/cat/CodeListMarshallingTest.java | 6 + .../sis/internal/jaxb/cat/EnumAdapterTest.java | 6 + .../sis/internal/jaxb/cat/EnumMarshallingTest.java | 6 + .../sis/internal/jaxb/gco/MultiplicityTest.java | 6 + .../sis/internal/jaxb/gco/PropertyTypeTest.java | 9 +- .../sis/internal/jaxb/gco/StringAdapterTest.java | 6 + .../apache/sis/internal/jaxb/gml/MeasureTest.java | 6 + .../sis/internal/jaxb/gml/TimePeriodTest.java | 6 + .../internal/jaxb/lan/FreeTextMarshallingTest.java | 6 + .../sis/internal/jaxb/lan/LanguageCodeTest.java | 6 + .../sis/internal/jaxb/lan/OtherLocalesTest.java | 6 + .../sis/internal/jaxb/lan/PT_LocaleTest.java | 6 + .../metadata/replace/QualityParameterTest.java | 6 + .../metadata/replace/ServiceParameterTest.java | 6 + .../sis/internal/metadata/AxisNamesTest.java | 6 + .../sis/internal/metadata/IdentifiersTest.java | 6 + .../metadata/ImplementationHelperTest.java | 6 + .../apache/sis/internal/metadata/MergerTest.java | 6 + .../sis/internal/metadata/NameMeaningTest.java | 6 + .../internal/metadata/sql/SQLUtilitiesTest.java | 6 + .../internal/metadata/sql/ScriptRunnerTest.java | 6 + .../sis/internal/metadata/sql/TypeMapperTest.java | 6 + .../sis/internal/simple/SimpleIdentifierTest.java | 6 + .../sis/internal/xml/DocumentComparatorTest.java | 6 + .../apache/sis/internal/xml/XmlUtilitiesTest.java | 6 + .../apache/sis/metadata/AbstractMetadataTest.java | 6 + .../java/org/apache/sis/metadata/HashCodeTest.java | 6 + .../apache/sis/metadata/InformationMapTest.java | 6 + .../apache/sis/metadata/MetadataCopierTest.java | 6 + .../apache/sis/metadata/MetadataStandardTest.java | 6 + .../java/org/apache/sis/metadata/NameMapTest.java | 6 + .../apache/sis/metadata/PropertyAccessorTest.java | 6 + .../sis/metadata/PropertyInformationTest.java | 6 + .../apache/sis/metadata/TreeNodeChildrenTest.java | 6 + .../java/org/apache/sis/metadata/TreeNodeTest.java | 6 + .../org/apache/sis/metadata/TreeTableViewTest.java | 6 + .../java/org/apache/sis/metadata/TypeMapTest.java | 6 + .../java/org/apache/sis/metadata/ValueMapTest.java | 6 + .../org/apache/sis/metadata/iso/APIVerifier.java | 6 + .../sis/metadata/iso/CustomMetadataTest.java | 6 + .../sis/metadata/iso/DefaultIdentifierTest.java | 6 + .../sis/metadata/iso/DefaultMetadataTest.java | 8 +- .../sis/metadata/iso/citation/CitationsTest.java | 6 + .../iso/citation/DefaultCitationDateTest.java | 6 + .../metadata/iso/citation/DefaultCitationTest.java | 6 + .../metadata/iso/citation/DefaultContactTest.java | 6 + .../iso/citation/DefaultResponsibilityTest.java | 6 + .../constraint/DefaultLegalConstraintsTest.java | 6 + .../sis/metadata/iso/content/DefaultBandTest.java | 6 + .../sis/metadata/iso/extent/DefaultExtentTest.java | 6 + .../extent/DefaultGeographicBoundingBoxTest.java | 6 + .../sis/metadata/iso/extent/ExtentsTest.java | 6 + .../identification/DefaultBrowseGraphicTest.java | 6 + .../identification/DefaultCoupledResourceTest.java | 6 + .../DefaultDataIdentificationTest.java | 6 + .../iso/identification/DefaultKeywordsTest.java | 6 + .../DefaultRepresentativeFractionTest.java | 6 + .../iso/identification/DefaultResolutionTest.java | 6 + .../DefaultServiceIdentificationTest.java | 6 + .../metadata/iso/lineage/DefaultLineageTest.java | 6 + .../iso/lineage/DefaultProcessStepTest.java | 6 + .../maintenance/DefaultScopeDescriptionTest.java | 6 + .../metadata/iso/quality/AbstractElementTest.java | 6 + .../quality/AbstractPositionalAccuracyTest.java | 6 + .../iso/quality/DefaultDomainConsistencyTest.java | 6 + .../iso/quality/DefaultEvaluationMethodTest.java | 6 + .../iso/quality/DefaultQuantitativeResultTest.java | 6 + .../sis/metadata/iso/quality/ScopeCodeTest.java | 6 + .../iso/spatial/DefaultGeorectifiedTest.java | 6 + .../sis/metadata/sql/IdentifierGeneratorTest.java | 7 +- .../sis/metadata/sql/MetadataFallbackVerifier.java | 6 + .../sis/metadata/sql/MetadataSourceTest.java | 6 + .../sis/metadata/sql/MetadataWriterTest.java | 6 + .../apache/sis/test/mock/FeatureAttributeMock.java | 6 + .../java/org/apache/sis/test/sql/TestDatabase.java | 2 - .../apache/sis/util/iso/DefaultLocalNameTest.java | 6 + .../sis/util/iso/DefaultRecordSchemaTest.java | 9 +- .../org/apache/sis/util/iso/DefaultRecordTest.java | 14 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 7 + .../apache/sis/util/iso/DefaultScopedNameTest.java | 6 + .../apache/sis/util/iso/NameMarshallingTest.java | 6 + .../java/org/apache/sis/util/iso/NamesTest.java | 6 + .../org/apache/sis/util/iso/TypeNamesTest.java | 6 + .../java/org/apache/sis/util/iso/TypesTest.java | 6 + .../sis/xml/CharSequenceSubstitutionTest.java | 6 + .../java/org/apache/sis/xml/LegacyCodesTest.java | 6 + .../org/apache/sis/xml/MarshallerPoolTest.java | 6 + .../java/org/apache/sis/xml/NamespacesTest.java | 6 + .../apache/sis/xml/NilReasonMarshallingTest.java | 73 +------ .../java/org/apache/sis/xml/NilReasonTest.java | 115 ++--------- .../java/org/apache/sis/xml/TransformerTest.java | 6 + .../apache/sis/xml/TransformingNamespacesTest.java | 6 + .../org/apache/sis/xml/UUIDMarshallingTest.java | 6 + .../org/apache/sis/xml/ValueConverterTest.java | 6 + .../org/apache/sis/xml/XLinkMarshallingTest.java | 6 + .../test/java/org/apache/sis/xml/XLinkTest.java | 6 + .../test/java/org/apache/sis/xml/XPointerTest.java | 6 + .../referencing/gazetteer/FinalLocationType.java | 7 + .../gazetteer/GeohashReferenceSystem.java | 1 + .../gazetteer/MilitaryGridReferenceSystem.java | 6 +- .../gazetteer/GazetteerFactoryTest.java | 6 + .../gazetteer/GeohashReferenceSystemTest.java | 6 + .../referencing/gazetteer/LocationFormatTest.java | 6 + .../referencing/gazetteer/LocationTypeTest.java | 6 + .../gazetteer/MilitaryGridReferenceSystemTest.java | 6 + .../gazetteer/ReferencingByIdentifiersTest.java | 6 + .../org/apache/sis/geometry/CoordinateFormat.java | 2 +- .../internal/jaxb/referencing/RS_Identifier.java | 6 + .../referencing/PositionalAccuracyConstant.java | 1 + .../sis/internal/referencing/ReferencingTypes.java | 6 + .../provider/MolodenskyInterpolation.java | 2 + .../sis/internal/referencing/provider/NADCON.java | 1 + .../apache/sis/io/wkt/GeodeticObjectParser.java | 1 + .../org/apache/sis/parameter/TensorParameters.java | 2 +- .../factory/ConcurrentAuthorityFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java | 2 + .../transform/DefaultMathTransformFactory.java | 2 + .../transform/InterpolatedMolodenskyTransform.java | 2 + .../InterpolatedMolodenskyTransform2D.java | 2 + .../sis/geometry/AbstractDirectPositionTest.java | 6 + .../apache/sis/geometry/AbstractEnvelopeTest.java | 6 + .../org/apache/sis/geometry/ArrayEnvelopeTest.java | 6 + .../apache/sis/geometry/CoordinateFormatTest.java | 6 + .../org/apache/sis/geometry/CurveExtremumTest.java | 6 + .../apache/sis/geometry/DirectPosition1DTest.java | 6 + .../apache/sis/geometry/DirectPosition2DTest.java | 6 + .../org/apache/sis/geometry/Envelope2DTest.java | 6 + .../org/apache/sis/geometry/EnvelopesTest.java | 6 + .../sis/geometry/GeneralDirectPositionTest.java | 6 + .../apache/sis/geometry/GeneralEnvelopeTest.java | 6 + .../apache/sis/geometry/ImmutableEnvelopeTest.java | 6 + .../java/org/apache/sis/geometry/Shapes2DTest.java | 6 + .../org/apache/sis/geometry/SubEnvelopeTest.java | 6 + .../sis/geometry/WraparoundAdjustmentTest.java | 6 + .../CC_GeneralOperationParameterTest.java | 6 + .../CC_OperationParameterGroupTest.java | 6 + .../sis/internal/jaxb/referencing/CodeTest.java | 6 + .../referencing/SecondDefiningParameterTest.java | 6 + .../sis/internal/referencing/AxesMapperTest.java | 6 + .../internal/referencing/AxisDirectionsTest.java | 6 + .../referencing/CoordinateOperationsTest.java | 6 + .../referencing/DefinitionVerifierTest.java | 6 + .../referencing/EllipsoidalHeightCombinerTest.java | 6 + .../internal/referencing/ExtentSelectorTest.java | 6 + .../sis/internal/referencing/FormulasTest.java | 6 + .../referencing/GeodeticObjectBuilderTest.java | 6 + .../sis/internal/referencing/LazySetTest.java | 6 + .../PositionalAccuracyConstantTest.java | 6 + .../referencing/ReferencingUtilitiesTest.java | 6 + .../referencing/ServicesForMetadataTest.java | 6 + .../referencing/VerticalDatumTypesTest.java | 6 + .../sis/internal/referencing/WKTKeywordsTest.java | 6 + .../sis/internal/referencing/WKTUtilitiesTest.java | 6 + .../referencing/WraparoundApplicatorTest.java | 6 + .../referencing/j2d/AbstractShapeTest.java | 6 + .../referencing/j2d/ShapeUtilitiesTest.java | 6 + .../internal/referencing/provider/AffineTest.java | 6 + .../provider/CoordinateFrameRotationTest.java | 6 + .../provider/DatumShiftGridCompressedTest.java | 6 + .../provider/DatumShiftGridFileTest.java | 6 + .../FranceGeocentricInterpolationTest.java | 6 + .../provider/GeocentricTranslationTest.java | 6 + .../referencing/provider/Geographic3Dto2DTest.java | 6 + .../provider/GeographicOffsetsTest.java | 6 + .../provider/LongitudeRotationTest.java | 6 + .../referencing/provider/MapProjectionTest.java | 6 + .../referencing/provider/MolodenskyTest.java | 7 + .../internal/referencing/provider/NADCONTest.java | 6 + .../internal/referencing/provider/NTv2Test.java | 6 + .../provider/PositionVector7ParamTest.java | 6 + .../referencing/provider/ProvidersTest.java | 7 + .../provider/TransverseMercatorTest.java | 6 + .../java/org/apache/sis/io/wkt/ColorsTest.java | 6 + .../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 + .../java/org/apache/sis/io/wkt/ConventionTest.java | 6 + .../java/org/apache/sis/io/wkt/ElementTest.java | 6 + .../java/org/apache/sis/io/wkt/FormatterTest.java | 6 + .../sis/io/wkt/GeodeticObjectParserTest.java | 6 + .../apache/sis/io/wkt/MathTransformParserTest.java | 6 + .../java/org/apache/sis/io/wkt/SymbolsTest.java | 6 + .../org/apache/sis/io/wkt/TransliteratorTest.java | 8 +- .../org/apache/sis/io/wkt/WKTDictionaryTest.java | 6 + .../java/org/apache/sis/io/wkt/WKTFormatTest.java | 6 + .../DefaultParameterDescriptorGroupTest.java | 6 + .../parameter/DefaultParameterDescriptorTest.java | 6 + .../parameter/DefaultParameterValueGroupTest.java | 9 +- .../sis/parameter/DefaultParameterValueTest.java | 6 + .../sis/parameter/MapProjectionParametersTest.java | 6 + .../apache/sis/parameter/ParameterBuilderTest.java | 6 + .../apache/sis/parameter/ParameterFormatTest.java | 6 + .../sis/parameter/ParameterMarshallingTest.java | 6 + .../org/apache/sis/parameter/ParametersTest.java | 6 + .../org/apache/sis/parameter/TensorValuesTest.java | 6 + .../UnmodifiableParameterValueGroupTest.java | 6 + .../parameter/UnmodifiableParameterValueTest.java | 6 + .../referencing/AbstractIdentifiedObjectTest.java | 6 + .../referencing/AbstractReferenceSystemTest.java | 6 + .../sis/referencing/AuthorityFactoriesTest.java | 6 + .../org/apache/sis/referencing/BuilderTest.java | 6 + .../java/org/apache/sis/referencing/CRSTest.java | 6 + .../org/apache/sis/referencing/CommonCRSTest.java | 6 + .../sis/referencing/EPSGFactoryFallbackTest.java | 6 + .../sis/referencing/IdentifiedObjectsTest.java | 6 + .../sis/referencing/ImmutableIdentifierTest.java | 7 + .../sis/referencing/NamedIdentifierTest.java | 6 + .../sis/referencing/StandardDefinitionsTest.java | 6 + .../sis/referencing/crs/AbstractCRSTest.java | 6 + .../referencing/crs/DefaultCompoundCRSTest.java | 6 + .../sis/referencing/crs/DefaultDerivedCRSTest.java | 6 + .../referencing/crs/DefaultEngineeringCRSTest.java | 6 + .../referencing/crs/DefaultGeocentricCRSTest.java | 6 + .../referencing/crs/DefaultGeodeticCRSTest.java | 6 + .../referencing/crs/DefaultGeographicCRSTest.java | 6 + .../sis/referencing/crs/DefaultImageCRSTest.java | 6 + .../referencing/crs/DefaultProjectedCRSTest.java | 6 + .../referencing/crs/DefaultTemporalCRSTest.java | 6 + .../referencing/crs/DefaultVerticalCRSTest.java | 6 + .../sis/referencing/crs/HardCodedCRSTest.java | 6 + .../apache/sis/referencing/crs/SubTypesTest.java | 6 + .../apache/sis/referencing/cs/AbstractCSTest.java | 6 + .../org/apache/sis/referencing/cs/CodesTest.java | 6 + .../sis/referencing/cs/CoordinateSystemsTest.java | 6 + .../sis/referencing/cs/DefaultCartesianCSTest.java | 6 + .../sis/referencing/cs/DefaultCompoundCSTest.java | 6 + .../cs/DefaultCoordinateSystemAxisTest.java | 6 + .../referencing/cs/DefaultCylindricalCSTest.java | 6 + .../referencing/cs/DefaultEllipsoidalCSTest.java | 6 + .../sis/referencing/cs/DefaultPolarCSTest.java | 6 + .../sis/referencing/cs/DefaultSphericalCSTest.java | 6 + .../referencing/cs/DirectionAlongMeridianTest.java | 6 + .../apache/sis/referencing/cs/HardCodedCSTest.java | 6 + .../apache/sis/referencing/cs/NormalizerTest.java | 6 + .../referencing/datum/BursaWolfParametersTest.java | 6 + .../referencing/datum/DefaultEllipsoidTest.java | 6 + .../datum/DefaultGeodeticDatumTest.java | 6 + .../datum/DefaultPrimeMeridianTest.java | 6 + .../datum/DefaultTemporalDatumTest.java | 6 + .../datum/DefaultVerticalDatumTest.java | 6 + .../referencing/datum/TimeDependentBWPTest.java | 6 + .../factory/AuthorityFactoryProxyTest.java | 6 + .../factory/ConcurrentAuthorityFactoryTest.java | 6 + .../factory/MultiAuthoritiesFactoryTest.java | 6 + .../referencing/factory/sql/EPSGFactoryTest.java | 6 + .../referencing/factory/sql/EPSGInstallerTest.java | 6 + .../sis/referencing/factory/sql/TableInfoTest.java | 6 + .../factory/sql/epsg/DataScriptFormatterTest.java | 6 + .../DefaultConcatenatedOperationTest.java | 6 + .../operation/DefaultConversionTest.java | 6 + .../DefaultCoordinateOperationFactoryTest.java | 6 + .../referencing/operation/DefaultFormulaTest.java | 6 + .../operation/DefaultOperationMethodTest.java | 6 + .../operation/DefaultPassThroughOperationTest.java | 6 + .../operation/DefaultTransformationTest.java | 6 + .../operation/SingleOperationMarshallingTest.java | 6 + .../builder/LinearTransformBuilderTest.java | 6 + .../operation/builder/LinearizerTest.java | 6 + .../builder/LocalizationGridBuilderTest.java | 6 + .../operation/matrix/AffineTransforms2DTest.java | 6 + .../operation/matrix/GeneralMatrixTest.java | 6 + .../referencing/operation/matrix/MatricesTest.java | 6 + .../referencing/operation/matrix/Matrix1Test.java | 6 + .../referencing/operation/matrix/Matrix2Test.java | 6 + .../referencing/operation/matrix/Matrix3Test.java | 6 + .../referencing/operation/matrix/Matrix4Test.java | 6 + .../operation/matrix/NonSquareMatrixTest.java | 6 + .../referencing/operation/matrix/SolverTest.java | 8 +- .../operation/projection/AlbersEqualAreaTest.java | 6 + .../projection/AuthalicConversionTest.java | 6 + .../projection/AzimuthalEquidistantTest.java | 6 + .../operation/projection/CassiniSoldnerTest.java | 6 + .../projection/ConformalProjectionTest.java | 6 + .../projection/CylindricalEqualAreaTest.java | 6 + .../operation/projection/EquirectangularTest.java | 6 + .../projection/LambertAzimuthalEqualAreaTest.java | 6 + .../projection/LambertConicConformalTest.java | 6 + .../operation/projection/MercatorTest.java | 6 + .../operation/projection/MeridianArcTest.java | 6 + .../ModifiedAzimuthalEquidistantTest.java | 6 + .../operation/projection/MollweideTest.java | 6 + .../projection/NormalizedProjectionTest.java | 6 + .../operation/projection/ObliqueMercatorTest.java | 6 + .../projection/ObliqueStereographicTest.java | 6 + .../operation/projection/OrthographicTest.java | 6 + .../projection/PolarStereographicTest.java | 6 + .../operation/projection/PolyconicTest.java | 6 + .../projection/SatelliteTrackingTest.java | 6 + .../operation/projection/SinusoidalTest.java | 6 + .../projection/TransverseMercatorTest.java | 6 + .../operation/projection/ZonedGridSystemTest.java | 6 + .../transform/AbstractMathTransformTest.java | 6 + .../operation/transform/CartesianToPolarTest.java | 6 + .../transform/CartesianToSphericalTest.java | 6 + .../transform/ConcatenatedTransformTest.java | 6 + .../transform/ContextualParametersTest.java | 6 + .../operation/transform/CoordinateDomainTest.java | 6 + .../transform/CoordinateSystemTransformTest.java | 6 + .../operation/transform/CopyTransformTest.java | 6 + .../transform/DefaultMathTransformFactoryTest.java | 6 + .../operation/transform/DomainDefinitionTest.java | 6 + .../transform/EllipsoidToCentricTransformTest.java | 6 + .../InterpolatedGeocentricTransformTest.java | 6 + .../InterpolatedMolodenskyTransformTest.java | 6 + .../transform/InterpolatedTransformTest.java | 6 + .../operation/transform/IterationStrategyTest.java | 6 + .../operation/transform/MathTransformWrapper.java | 1 + .../operation/transform/MathTransformsTest.java | 6 + .../transform/OperationMethodSetTest.java | 6 + .../transform/PassThroughTransformTest.java | 6 + .../operation/transform/PolarToCartesianTest.java | 6 + .../operation/transform/ScaleTransformTest.java | 6 + .../transform/SpecializableTransformTest.java | 6 + .../transform/SphericalToCartesianTest.java | 6 + .../operation/transform/TransferFunctionTest.java | 6 + .../transform/TransformSeparatorTest.java | 6 + .../transform/TranslationTransformTest.java | 6 + .../operation/transform/UnitConversionTest.java | 6 + .../transform/WraparoundTransformTest.java | 6 + .../sis/test/integration/ConsistencyTest.java | 6 + .../integration/CoordinateReferenceSystemTest.java | 6 + .../sis/test/integration/DatumShiftTest.java | 8 +- .../apache/sis/test/integration/MetadataTest.java | 6 + .../sis/test/integration/MetadataVerticalTest.java | 6 + .../sis/internal/converter/StringConverter.java | 4 +- .../org/apache/sis/internal/jdk17/HexFormat.java | 5 +- .../java/org/apache/sis/internal/jdk17/JDK17.java | 9 + .../org/apache/sis/internal/system/Reflect.java | 2 +- .../org/apache/sis/internal/util/AbstractMap.java | 11 +- .../apache/sis/internal/util/CollectionsExt.java | 2 + .../org/apache/sis/internal/util/Numerics.java | 6 +- .../main/java/org/apache/sis/math/ArrayVector.java | 5 +- .../java/org/apache/sis/measure/AngleFormat.java | 4 +- .../sis/util/DefaultInternationalString.java | 5 +- .../main/java/org/apache/sis/util/Disposable.java | 4 +- .../src/main/java/org/apache/sis/util/Locales.java | 3 + .../org/apache/sis/util/collection/Containers.java | 1 + .../sis/util/collection/TreeTableFormat.java | 3 +- .../sis/internal/converter/AngleConverterTest.java | 7 +- .../sis/internal/converter/ArrayConverterTest.java | 6 + .../internal/converter/ConverterRegistryTest.java | 12 +- .../internal/converter/FallbackConverterTest.java | 6 + .../internal/converter/NumberConverterTest.java | 6 + .../sis/internal/converter/PathConverterTest.java | 17 +- .../internal/converter/StringConverterTest.java | 8 +- .../sis/internal/converter/SystemRegistryTest.java | 6 + .../apache/sis/internal/system/LoggersTest.java | 6 + .../system/ReferenceQueueConsumerTest.java | 6 + .../org/apache/sis/internal/test/AssertTest.java | 6 + .../sis/internal/test/TestUtilitiesTest.java | 6 + .../apache/sis/internal/util/AbstractMapTest.java | 6 + .../java/org/apache/sis/internal/util/BagTest.java | 6 + .../sis/internal/util/CheckedArrayListTest.java | 6 + .../sis/internal/util/CollectionsExtTest.java | 6 + .../sis/internal/util/DefinitionURITest.java | 6 + .../apache/sis/internal/util/DoubleDoubleTest.java | 9 +- .../sis/internal/util/ListOfUnknownSizeTest.java | 6 + .../internal/util/LocalizedParseExceptionTest.java | 6 + .../org/apache/sis/internal/util/NumericsTest.java | 7 +- .../sis/internal/util/StandardDateFormatTest.java | 6 + .../org/apache/sis/internal/util/StringsTest.java | 6 + .../org/apache/sis/internal/util/X364Test.java | 6 + .../java/org/apache/sis/io/LeftMarginTest.java | 6 + .../org/apache/sis/io/TabulationExpansionTest.java | 6 + .../test/java/org/apache/sis/io/WordWrapTest.java | 6 + .../sis/io/WordWrapWithLineSeparatorTest.java | 6 + .../org/apache/sis/math/DecimalFunctionsTest.java | 6 + .../java/org/apache/sis/math/FractionTest.java | 6 + .../org/apache/sis/math/FunctionPropertyTest.java | 6 + .../test/java/org/apache/sis/math/LineTest.java | 6 + .../apache/sis/math/LinearlyDerivedVectorTest.java | 6 + .../org/apache/sis/math/MathFunctionsTest.java | 6 + .../test/java/org/apache/sis/math/PlaneTest.java | 6 + .../org/apache/sis/math/RepeatedVectorTest.java | 6 + .../org/apache/sis/math/StatisticsFormatTest.java | 6 + .../java/org/apache/sis/math/StatisticsTest.java | 6 + .../test/java/org/apache/sis/math/VectorTest.java | 6 + .../org/apache/sis/measure/AngleFormatTest.java | 6 + .../java/org/apache/sis/measure/AngleTest.java | 6 + .../apache/sis/measure/ConventionalUnitTest.java | 6 + .../java/org/apache/sis/measure/DateRangeTest.java | 6 + .../measure/FormattedCharacterIteratorTest.java | 6 + .../apache/sis/measure/LinearConverterTest.java | 6 + .../apache/sis/measure/MeasurementRangeTest.java | 6 + .../org/apache/sis/measure/NumberRangeTest.java | 6 + .../java/org/apache/sis/measure/PrefixesTest.java | 6 + .../org/apache/sis/measure/QuantitiesTest.java | 6 + .../org/apache/sis/measure/RangeFormatTest.java | 6 + .../java/org/apache/sis/measure/RangeTest.java | 6 + .../java/org/apache/sis/measure/ScalarTest.java | 6 + .../sis/measure/SexagesimalConverterTest.java | 6 + .../org/apache/sis/measure/SystemUnitTest.java | 6 + .../org/apache/sis/measure/UnitDimensionTest.java | 6 + .../org/apache/sis/measure/UnitFormatTest.java | 6 + .../org/apache/sis/measure/UnitServicesTest.java | 6 + .../java/org/apache/sis/measure/UnitsTest.java | 6 + .../java/org/apache/sis/setup/OptionKeyTest.java | 6 + .../src/test/java/org/apache/sis/test/Assume.java | 4 +- .../org/apache/sis/util/ArgumentChecksTest.java | 6 + .../java/org/apache/sis/util/ArraysExtTest.java | 6 + .../org/apache/sis/util/CharSequencesTest.java | 6 + .../java/org/apache/sis/util/CharactersTest.java | 6 + .../test/java/org/apache/sis/util/ClassesTest.java | 6 + .../sis/util/DefaultInternationalStringTest.java | 6 + .../java/org/apache/sis/util/ExceptionsTest.java | 6 + .../test/java/org/apache/sis/util/LocalesTest.java | 8 + .../test/java/org/apache/sis/util/NumbersTest.java | 6 + .../sis/util/SimpleInternationalStringTest.java | 6 + .../org/apache/sis/util/StringBuildersTest.java | 6 + .../java/org/apache/sis/util/UtilitiesTest.java | 6 + .../test/java/org/apache/sis/util/VersionTest.java | 6 + .../org/apache/sis/util/collection/CacheTest.java | 21 +- .../sis/util/collection/CodeListSetTest.java | 6 + .../sis/util/collection/DefaultTreeTableTest.java | 6 + .../apache/sis/util/collection/DerivedMapTest.java | 6 + .../apache/sis/util/collection/DerivedSetTest.java | 6 + .../util/collection/FrequencySortedSetTest.java | 6 + .../sis/util/collection/IntegerListTest.java | 6 + .../apache/sis/util/collection/RangeSetTest.java | 6 + .../sis/util/collection/TableColumnTest.java | 6 + .../sis/util/collection/TreeTableFormatTest.java | 6 + .../apache/sis/util/collection/TreeTablesTest.java | 6 + .../sis/util/collection/WeakHashSetTest.java | 7 +- .../sis/util/collection/WeakValueHashMapTest.java | 8 +- .../sis/util/logging/MonolineFormatterTest.java | 6 + .../sis/util/logging/PerformanceLevelTest.java | 6 + .../util/resources/IndexedResourceBundleTest.java | 6 + ide-project/NetBeans/nbproject/project.properties | 2 +- .../sis/internal/profile/fra/ProfileTypes.java | 6 + .../profile/fra/DataIdentificationTest.java | 6 + .../profile/fra/DirectReferenceSystemTest.java | 6 + .../sis/profile/france/FrenchProfileTest.java | 6 + .../apache/sis/profile/japan/JapanProfileTest.java | 6 + .../apache/sis/storage/landsat/MetadataReader.java | 5 +- .../storage/landsat/LandsatStoreProviderTest.java | 6 + .../sis/storage/landsat/MetadataReaderTest.java | 8 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 3 +- .../sis/storage/geotiff/ImageFileDirectory.java | 92 ++++----- .../apache/sis/storage/geotiff/NativeMetadata.java | 10 +- .../java/org/apache/sis/storage/geotiff/Type.java | 138 ++++++------- .../apache/sis/storage/geotiff/XMLMetadata.java | 9 +- .../sis/internal/geotiff/CompressionTest.java | 6 + .../internal/storage/inflater/InflaterTest.java | 6 + .../apache/sis/storage/geotiff/CRSBuilderTest.java | 6 + .../apache/sis/storage/geotiff/GeoCodesTest.java | 6 + .../apache/sis/storage/geotiff/GeoKeysTest.java | 6 + .../org/apache/sis/storage/geotiff/TagsTest.java | 6 + .../org/apache/sis/storage/geotiff/TypeTest.java | 14 +- .../sis/storage/geotiff/XMLMetadataTest.java | 6 + .../org/apache/sis/internal/netcdf/AxisTest.java | 6 + .../apache/sis/internal/netcdf/DataTypeTest.java | 6 + .../apache/sis/internal/netcdf/DecoderTest.java | 6 + .../org/apache/sis/internal/netcdf/GridTest.java | 6 + .../org/apache/sis/internal/netcdf/TestCase.java | 7 +- .../internal/netcdf/impl/ChannelDecoderTest.java | 6 + .../sis/storage/netcdf/MetadataReaderTest.java | 6 + .../storage/netcdf/NetcdfStoreProviderTest.java | 6 + .../apache/sis/storage/netcdf/NetcdfStoreTest.java | 6 + .../jdbc/AbstractTestBaseForInternalJDBC.java | 6 + .../internal/shapefile/jdbc/DBFConnectionTest.java | 6 + .../internal/shapefile/jdbc/DBFResultSetTest.java | 6 + .../internal/shapefile/jdbc/DBFStatementTest.java | 6 + .../shapefile/jdbc/sql/WhereClauseTest.java | 6 + .../sis/storage/shapefile/ShapeFileTest.java | 6 + .../sis/internal/sql/feature/ValueGetter.java | 4 +- .../sis/internal/sql/postgis/ExtentEstimator.java | 6 +- .../apache/sis/internal/sql/postgis/Postgres.java | 2 + .../apache/sis/internal/sql/postgis/BandTest.java | 6 + .../sis/internal/sql/postgis/RasterReaderTest.java | 6 + .../sis/internal/sql/postgis/RasterWriterTest.java | 6 + .../org/apache/sis/storage/sql/SQLStoreTest.java | 8 +- .../sis/internal/storage/MetadataBuilder.java | 39 +--- .../apache/sis/internal/storage/PRJDataStore.java | 13 +- .../org/apache/sis/internal/storage/csv/Store.java | 2 +- .../sis/internal/storage/esri/RasterStore.java | 3 +- .../apache/sis/internal/storage/folder/Store.java | 3 +- .../sis/internal/storage/io/IOUtilities.java | 119 ++++++----- .../sis/internal/storage/wkt/StoreProvider.java | 8 +- .../java/org/apache/sis/storage/FeatureQuery.java | 1 + .../aggregate/BandAggregateGridResource.java | 2 +- .../apache/sis/internal/storage/CodeTypeTest.java | 8 +- .../sis/internal/storage/MetadataBuilderTest.java | 6 + .../sis/internal/storage/StoreUtilitiesTest.java | 6 + .../internal/storage/csv/StoreProviderTest.java | 6 + .../apache/sis/internal/storage/csv/StoreTest.java | 6 + .../internal/storage/esri/AsciiGridStoreTest.java | 6 + .../internal/storage/esri/WritableStoreTest.java | 6 + .../sis/internal/storage/folder/StoreTest.java | 6 + .../internal/storage/image/WorldFileStoreTest.java | 6 + .../internal/storage/io/ChannelDataInputTest.java | 6 + .../internal/storage/io/ChannelDataOutputTest.java | 6 + .../storage/io/ChannelImageInputStreamTest.java | 6 + .../storage/io/ChannelImageOutputStreamTest.java | 6 + .../storage/io/FileCacheByteChannelTest.java | 6 + .../storage/io/HyperRectangleReaderTest.java | 6 + .../sis/internal/storage/io/IOUtilitiesTest.java | 67 ++++--- .../storage/io/InputStreamArrayGetterTest.java | 6 + .../storage/io/RewindableLineReaderTest.java | 6 + .../internal/storage/wkt/StoreProviderTest.java | 6 + .../apache/sis/internal/storage/wkt/StoreTest.java | 6 + .../internal/storage/xml/MimeTypeDetectorTest.java | 6 + .../internal/storage/xml/StoreProviderTest.java | 6 + .../apache/sis/internal/storage/xml/StoreTest.java | 6 + .../org/apache/sis/storage/DataStoresTest.java | 6 + .../org/apache/sis/storage/ProbeResultTest.java | 6 + .../apache/sis/storage/StorageConnectorTest.java | 6 + .../aggregate/ConcatenatedFeatureSetTest.java | 6 + .../storage/aggregate/CoverageAggregatorTest.java | 6 + .../internal/storage/xml/stream/StaxDataStore.java | 10 +- .../internal/storage/xml/stream/StaxStreamIO.java | 8 +- .../storage/xml/stream/StaxStreamReader.java | 3 +- .../storage/xml/stream/StaxStreamWriter.java | 3 +- .../sis/internal/storage/gpx/MetadataTest.java | 6 + .../sis/internal/storage/gpx/ReaderTest.java | 6 + .../apache/sis/internal/storage/gpx/TypesTest.java | 6 + .../sis/internal/storage/gpx/UpdaterTest.java | 6 + .../sis/internal/storage/gpx/WriterTest.java | 11 +- 635 files changed, 3985 insertions(+), 651 deletions(-) diff --cc core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java index 02d12a840d,05e15b87a4..4836b86dd1 --- a/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java +++ b/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java @@@ -76,8 -86,9 +76,9 @@@ final class Validator * @param explanation explanation of the constraint violation. * @return the {@code report}, or a new report if {@code report} was null. */ + @SuppressWarnings("deprecation") private AbstractElement addViolationReport(AbstractElement report, - final PropertyType type, final InternationalString explanation) + final AbstractIdentifiedType type, final InternationalString explanation) { if (report == null) { final GenericName name = type.getName(); diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java index cf0fd652e8,cd4ede9141..49ff7b1888 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java @@@ -65,8 -70,14 +65,14 @@@ public final class EnvelopeOperationTes /** * The feature created by a test method. Saved for allowing additional checks or operations. */ - private Feature feature; + private AbstractFeature feature; + /** + * Creates a new test case. + */ + public EnvelopeOperationTest() { + } + /** * Creates the feature type with two geometric properties without default CRS. * diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java index fee4772b5f,2887573a9c..4a7f35abb6 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java @@@ -33,8 -37,14 +33,14 @@@ import static org.junit.Assert.* */ @DependsOn(SingletonAttributeTest.class) public final class FeaturesTest extends TestCase { + /** + * Creates a new test case. + */ + public FeaturesTest() { + } + /** - * Tests {@link Features#cast(AttributeType, Class)}. + * Tests {@code Features.cast(AttributeType, Class)}. */ @Test public void testCastAttributeType() { diff --cc core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java index b842817a52,d44840274e..fd5459d5d5 --- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java +++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java @@@ -51,8 -53,14 +51,14 @@@ import org.apache.sis.feature.DefaultFe */ @DependsOn(AttributeTypeBuilderTest.class) public final class FeatureTypeBuilderTest extends TestCase { + /** + * Creates a new test case. + */ + public FeatureTypeBuilderTest() { + } + /** - * Verifies that {@link FeatureTypeBuilder#setSuperTypes(FeatureType...)} ignores null parents. + * Verifies that {@code FeatureTypeBuilder.setSuperTypes(FeatureType...)} ignores null parents. * This method tests only the builder state without creating feature type. */ @Test diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java index c623086549,c025eb7e66..2a2e2f6566 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java @@@ -59,8 -55,8 +59,9 @@@ import static org.opengis.annotation.Sp DefaultTemporalConsistency.class, DefaultTemporalValidity.class }) + @SuppressWarnings("deprecation") -public class AbstractTemporalQuality extends AbstractElement implements TemporalQuality { +@UML(identifier="DQ_TemporalQuality", specification=UNSPECIFIED) +public class AbstractTemporalQuality extends AbstractElement implements TemporalAccuracy { /** * Serial number for inter-operability with different versions. */ diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java index 13bbbd0ab9,195d67988b..fcbbdd35a9 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java @@@ -53,9 -50,9 +53,10 @@@ import static org.opengis.annotation.Sp @XmlSeeAlso({ DefaultNonQuantitativeAttributeAccuracy.class }) + @SuppressWarnings("deprecation") +@UML(identifier="DQ_NonQuantitativeAttributeCorrectness", specification=UNSPECIFIED) public class DefaultNonQuantitativeAttributeCorrectness extends AbstractThematicAccuracy - implements NonQuantitativeAttributeCorrectness + implements NonQuantitativeAttributeAccuracy { /** * Serial number for inter-operability with different versions. diff --cc core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java index 13a555d1f4,0ac66e49b7..8683302ad0 --- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java @@@ -104,10 -111,10 +111,10 @@@ public final class DefaultRecordSchemaT * The DefaultRecordType(TypeName, RecordSchema, Map) constructor performs many argument checks, so * we use that constructor as a way to perform a final validation, especially regarding namespaces. */ - final DefaultRecordType copy = new DefaultRecordType( + final var copy = new DefaultRecordType( recordType.getTypeName(), recordType.getContainer(), - recordType.getFieldTypes()); + recordType.getMemberTypes()); assertEquals(recordType, copy); } } diff --cc core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java index 4b6a6101e5,966f5ff70f..8a783451bc --- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java +++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java @@@ -88,13 -97,15 +93,15 @@@ final class FinalLocationType extends A * Parent location types (location types of which this location type is a sub-division). * This list is unmodifiable. */ + @SuppressWarnings("serial") - private final List<LocationType> parents; + private final List<AbstractLocationType> parents; /** * Child location types (location types which sub-divides this location type). * This list is unmodifiable. */ + @SuppressWarnings("serial") - final List<LocationType> children; + final List<AbstractLocationType> children; /** * Creates a copy of the given location type with the reference system set to the given value. diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java index 11ac553d11,b1d66bd1d2..1b682fe36b --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java @@@ -61,7 -60,13 +61,13 @@@ import org.opengis.metadata.Identifier * @version 1.4 * @since 0.4 */ -public final class RS_Identifier extends XmlAdapter<Code, Identifier> { +public final class RS_Identifier extends XmlAdapter<Code, ReferenceIdentifier> { + /** + * Empty constructor for JAXB. + */ + public RS_Identifier() { + } + /** * Substitutes the wrapper value read from an XML stream by the object which will * represents the identifier. JAXB calls automatically this method at unmarshalling time. diff --cc core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java index ffb2bcd15e,5fc95b7db2..8fc7271a25 --- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java @@@ -63,8 -60,14 +63,14 @@@ public class GeneralEnvelopeTest extend * This is set to {@code true} only when we intentionally want to create an invalid envelope, * for example in order to test normalization. */ - boolean skipValidation; + boolean skipValidation = !PENDING_NEXT_GEOAPI_RELEASE; + /** + * Creates a new test case. + */ + public GeneralEnvelopeTest() { + } + /** * Creates a new geographic envelope for the given coordinate values. * The {@literal [xmin … xmax]} may span the anti-meridian. diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java index 22c3fbd1b1,d81b3b7e68..a59ccb1de1 --- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java @@@ -39,11 -39,17 +39,17 @@@ import static org.junit.Assert.* * @since 0.4 */ public final class CodeTest extends TestCase { + /** + * Creates a new test case. + */ + public CodeTest() { + } + /** - * Tests the {@link Code#Code(Identifier)} constructor with {@code "EPSG:4326"} identifier. + * Tests the {@link Code#Code(ReferenceIdentifier)} constructor with {@code "EPSG:4326"} identifier. * This test intentionally uses an identifier with the {@code IOGP} authority instead of * EPSG in order to make sure that the {@code codeSpace} attribute is set from - * {@link Identifier#getCodeSpace()}, not from {@link Identifier#getAuthority()}. + * {@code Identifier.getCodeSpace()}, not from {@code Identifier.getAuthority()}. */ @Test public void testSimple() { diff --cc core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java index cec32dd9ca,ae2d8e5b85..7e2a3cfe08 --- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java @@@ -39,7 -40,14 +39,13 @@@ import static org.apache.sis.test.Asser * @version 1.1 * @since 1.0 */ -@DependsOn(WKTParserTest.class) public final class ComparisonWithEPSG extends TestCase { + /** + * Creates a new test case. + */ + public ComparisonWithEPSG() { + } + /** * Creates the factory to use for all tests in this class. * diff --cc core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java index 76ef88776c,1d5a9641c0..ecfd72b333 --- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java @@@ -117,18 -115,12 +117,24 @@@ public final class MetadataTest extend loggings.assertNoUnexpectedLog(); } + /** + * Creates a new test case. + */ + public MetadataTest() { + } + + /** + * Creates a telephone number of the given type. + * + * @param type Either {@code "VOICE"}, {@code "FACSIMILE"} or {@code "SMS"}. + */ + private static DefaultTelephone telephone(final String number, final String type) { + final DefaultTelephone tel = new DefaultTelephone(); + tel.setNumber(number); + tel.setNumberType(UnsupportedCodeList.valueOf(type)); + return tel; + } + /** * Programmatically creates the metadata to marshal, or to compare against the unmarshalled metadata. * diff --cc storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java index 86be4c2b3f,901473663e..b417b3eec9 --- a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java +++ b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java @@@ -856,8 -857,8 +857,8 @@@ final class MetadataReader extends Meta * @throws FactoryException if an error occurred while creating the Coordinate Reference System. */ final Metadata getMetadata() throws FactoryException { - addLanguage(Locale.ENGLISH, MetadataBuilder.Scope.METADATA); + addLanguage(Locale.ENGLISH, StandardCharsets.US_ASCII, MetadataBuilder.Scope.METADATA); - addResourceScope(ScopeCode.COVERAGE, null); + addResourceScope(ScopeCode.valueOf("COVERAGE"), null); addTopicCategory(TopicCategory.GEOSCIENTIFIC_INFORMATION); try { flushSceneTime(); diff --cc storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java index 3294943ca0,d4bde598dc..d607bfbda6 --- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java +++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java @@@ -293,8 -294,8 +294,8 @@@ public class GeoTiffStore extends DataS builder.addFormatName(Constants.GEOTIFF); listeners.warning(e); } - builder.addEncoding(encoding, MetadataBuilder.Scope.METADATA); + builder.addLanguage(Locale.ENGLISH, encoding, MetadataBuilder.Scope.METADATA); - builder.addResourceScope(ScopeCode.COVERAGE, null); + builder.addResourceScope(ScopeCode.valueOf("COVERAGE"), null); } /** diff --cc storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java index 62a21d5c34,f939c4332b..dcdb305b70 --- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java +++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java @@@ -28,7 -28,10 +28,9 @@@ import org.apache.sis.internal.netcdf.u import org.apache.sis.setup.GeometryLibrary; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.DataStoreMock; -import org.opengis.test.dataset.TestData; + import ucar.nc2.dataset.NetcdfDatasets; import ucar.nc2.dataset.NetcdfDataset; + import ucar.nc2.NetcdfFiles; import ucar.nc2.NetcdfFile; import org.junit.AfterClass; diff --cc storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/RasterStore.java index 209df4d0d0,5226f189f9..45e415b13c --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/RasterStore.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/RasterStore.java @@@ -173,8 -174,8 +174,8 @@@ abstract class RasterStore extends PRJD builder.addFormatName(formatName); listeners.warning(e); } - builder.addResourceScope(ScopeCode.COVERAGE, null); + builder.addResourceScope(ScopeCode.valueOf("COVERAGE"), null); - builder.addEncoding(encoding, MetadataBuilder.Scope.METADATA); + builder.addLanguage(Locale.ENGLISH, encoding, MetadataBuilder.Scope.METADATA); builder.addSpatialRepresentation(null, gridGeometry, true); try { builder.addExtent(gridGeometry.getEnvelope()); diff --cc storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java index e597c29319,08a047c56a..d73d0fe823 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java @@@ -271,9 -271,8 +271,8 @@@ class Store extends DataStore implement public synchronized Metadata getMetadata() { if (metadata == null) { final MetadataBuilder mb = new MetadataBuilder(); - mb.addResourceScope(ScopeCode.COLLECTION, Resources.formatInternational(Resources.Keys.DirectoryContent_1, getDisplayName())); + mb.addResourceScope(ScopeCode.valueOf("COLLECTION"), Resources.formatInternational(Resources.Keys.DirectoryContent_1, getDisplayName())); - mb.addLanguage(locale, MetadataBuilder.Scope.RESOURCE); - mb.addEncoding(encoding, MetadataBuilder.Scope.RESOURCE); + mb.addLanguage(locale, encoding, MetadataBuilder.Scope.RESOURCE); final GenericName identifier = identifier(null); String name = null; if (identifier != null) { diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java index c4b1749677,8a2d96032a..f9465d48d8 --- a/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java @@@ -374,12 -378,11 +374,13 @@@ public class FeatureQuery extends Quer * * @param properties expressions to use for sorting the feature instances, * or {@code null} or an empty array if none. + * + * @todo Not yet in public API. Pending publication of {@link SortProperty} interface. */ @SafeVarargs + @SuppressWarnings("varargs") - public final void setSortBy(final SortProperty<Feature>... properties) { - SortBy<Feature> sortBy = null; + final void setSortBy(final SortProperty<AbstractFeature>... properties) { + SortBy<AbstractFeature> sortBy = null; if (properties != null) { sortBy = SortByComparator.create(properties); }