This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 0987be2363ca563801aa01dcdd796d888527a9b4 Merge: 4a2e1aefb5 b8ec6bbb3c Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jun 5 11:31:43 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/console/FormattedOutputCommand.java | 6 +-- .../sis/internal/jaxb/AdapterReplacement.java | 12 ++--- .../apache/sis/internal/jaxb/TypeRegistration.java | 6 +-- .../sis/internal/jaxb/cat/CodeListAdapter.java | 4 +- .../apache/sis/internal/jaxb/cat/CodeListUID.java | 8 ++-- .../apache/sis/internal/jaxb/cat/EnumAdapter.java | 4 +- .../sis/internal/jaxb/code/CI_DateTypeCode.java | 4 +- .../internal/jaxb/code/CI_OnLineFunctionCode.java | 4 +- .../jaxb/code/CI_PresentationFormCode.java | 4 +- .../apache/sis/internal/jaxb/code/CI_RoleCode.java | 4 +- .../internal/jaxb/code/CI_TelephoneTypeCode.java | 4 +- .../org/apache/sis/internal/jaxb/code/DCPList.java | 4 +- .../sis/internal/jaxb/code/DQM_ValueStructure.java | 4 +- .../jaxb/code/DQ_EvaluationMethodTypeCode.java | 4 +- .../internal/jaxb/code/DS_AssociationTypeCode.java | 4 +- .../internal/jaxb/code/DS_InitiativeTypeCode.java | 4 +- .../internal/jaxb/code/MD_CellGeometryCode.java | 4 +- .../internal/jaxb/code/MD_CharacterSetCode.java | 6 +-- .../internal/jaxb/code/MD_ClassificationCode.java | 4 +- .../jaxb/code/MD_CoverageContentTypeCode.java | 4 +- .../sis/internal/jaxb/code/MD_DatatypeCode.java | 4 +- .../jaxb/code/MD_DimensionNameTypeCode.java | 4 +- .../jaxb/code/MD_GeometricObjectTypeCode.java | 4 +- .../jaxb/code/MD_ImagingConditionCode.java | 4 +- .../sis/internal/jaxb/code/MD_KeywordTypeCode.java | 4 +- .../jaxb/code/MD_MaintenanceFrequencyCode.java | 4 +- .../internal/jaxb/code/MD_MediumFormatCode.java | 4 +- .../sis/internal/jaxb/code/MD_MediumNameCode.java | 4 +- .../sis/internal/jaxb/code/MD_ObligationCode.java | 4 +- .../jaxb/code/MD_PixelOrientationCode.java | 4 +- .../sis/internal/jaxb/code/MD_ProgressCode.java | 4 +- .../sis/internal/jaxb/code/MD_RestrictionCode.java | 4 +- .../sis/internal/jaxb/code/MD_ScopeCode.java | 4 +- .../code/MD_SpatialRepresentationTypeCode.java | 4 +- .../internal/jaxb/code/MD_TopicCategoryCode.java | 4 +- .../internal/jaxb/code/MD_TopologyLevelCode.java | 4 +- .../sis/internal/jaxb/code/MI_BandDefinition.java | 4 +- .../sis/internal/jaxb/code/MI_ContextCode.java | 4 +- .../internal/jaxb/code/MI_GeometryTypeCode.java | 4 +- .../internal/jaxb/code/MI_ObjectiveTypeCode.java | 4 +- .../internal/jaxb/code/MI_OperationTypeCode.java | 4 +- .../jaxb/code/MI_PolarisationOrientationCode.java | 4 +- .../sis/internal/jaxb/code/MI_PriorityCode.java | 4 +- .../sis/internal/jaxb/code/MI_SequenceCode.java | 4 +- .../jaxb/code/MI_TransferFunctionTypeCode.java | 4 +- .../sis/internal/jaxb/code/MI_TriggerCode.java | 4 +- .../sis/internal/jaxb/code/SV_CouplingType.java | 4 +- .../internal/jaxb/code/SV_ParameterDirection.java | 4 +- .../sis/internal/jaxb/code/package-info.java | 10 ++--- .../sis/internal/jaxb/gco/CharSequenceAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Boolean.java | 8 ++-- .../sis/internal/jaxb/gco/GO_CharacterString.java | 16 +++---- .../apache/sis/internal/jaxb/gco/GO_DateTime.java | 10 ++--- .../apache/sis/internal/jaxb/gco/GO_Decimal.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Distance.java | 8 ++-- .../sis/internal/jaxb/gco/GO_GenericName.java | 6 +-- .../apache/sis/internal/jaxb/gco/GO_Integer.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Integer64.java | 6 +-- .../apache/sis/internal/jaxb/gco/GO_Measure.java | 8 ++-- .../internal/jaxb/gco/GO_MultiplicityRange.java | 4 +- .../org/apache/sis/internal/jaxb/gco/GO_Real.java | 8 ++-- .../apache/sis/internal/jaxb/gco/GO_Record.java | 4 +- .../sis/internal/jaxb/gco/GO_RecordType.java | 4 +- .../apache/sis/internal/jaxb/gco/GO_Temporal.java | 10 ++--- .../org/apache/sis/internal/jaxb/gco/GO_URL.java | 4 +- .../sis/internal/jaxb/gco/GO_UnlimitedInteger.java | 6 +-- .../jaxb/gco/InternationalStringAdapter.java | 4 +- .../jaxb/gco/InternationalStringConverter.java | 4 +- .../apache/sis/internal/jaxb/gco/Multiplicity.java | 10 ++--- .../sis/internal/jaxb/gco/MultiplicityRange.java | 8 ++-- .../apache/sis/internal/jaxb/gco/NameValue.java | 12 ++--- .../apache/sis/internal/jaxb/gco/PropertyType.java | 8 ++-- .../sis/internal/jaxb/gco/StringAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/URIAdapter.java | 4 +- .../apache/sis/internal/jaxb/gco/UnitAdapter.java | 4 +- .../sis/internal/jaxb/gco/UnlimitedInteger.java | 12 ++--- .../apache/sis/internal/jaxb/gco/package-info.java | 14 +++--- .../org/apache/sis/internal/jaxb/gcx/Anchor.java | 8 ++-- .../org/apache/sis/internal/jaxb/gcx/FileName.java | 10 ++--- .../apache/sis/internal/jaxb/gcx/MimeFileType.java | 10 ++--- .../apache/sis/internal/jaxb/gcx/package-info.java | 16 +++---- .../sis/internal/jaxb/geometry/GM_Object.java | 8 ++-- .../sis/internal/jaxb/geometry/ObjectFactory.java | 8 ++-- .../sis/internal/jaxb/geometry/package-info.java | 14 +++--- .../sis/internal/jaxb/gmi/LE_ProcessStep.java | 6 +-- .../apache/sis/internal/jaxb/gmi/LE_Source.java | 6 +-- .../org/apache/sis/internal/jaxb/gmi/MI_Band.java | 6 +-- .../internal/jaxb/gmi/MI_CoverageDescription.java | 6 +-- .../sis/internal/jaxb/gmi/MI_Georectified.java | 6 +-- .../sis/internal/jaxb/gmi/MI_Georeferenceable.java | 6 +-- .../sis/internal/jaxb/gmi/MI_ImageDescription.java | 6 +-- .../apache/sis/internal/jaxb/gmi/MI_Metadata.java | 6 +-- .../apache/sis/internal/jaxb/gmi/package-info.java | 12 ++--- .../sis/internal/jaxb/gml/CodeListAdapter.java | 8 ++-- .../apache/sis/internal/jaxb/gml/DateAdapter.java | 4 +- .../apache/sis/internal/jaxb/gml/GMLAdapter.java | 8 ++-- .../org/apache/sis/internal/jaxb/gml/Measure.java | 8 ++-- .../apache/sis/internal/jaxb/gml/MeasureList.java | 8 ++-- .../sis/internal/jaxb/gml/SC_VerticalCRS.java | 4 +- .../apache/sis/internal/jaxb/gml/TM_Primitive.java | 4 +- .../apache/sis/internal/jaxb/gml/TimeInstant.java | 8 ++-- .../apache/sis/internal/jaxb/gml/TimePeriod.java | 10 ++--- .../sis/internal/jaxb/gml/TimePeriodBound.java | 10 ++--- .../internal/jaxb/gml/UniversalTimeAdapter.java | 4 +- .../apache/sis/internal/jaxb/gml/package-info.java | 14 +++--- .../apache/sis/internal/jaxb/gts/TM_Duration.java | 4 +- .../sis/internal/jaxb/gts/TM_PeriodDuration.java | 4 +- .../apache/sis/internal/jaxb/gts/package-info.java | 12 ++--- .../org/apache/sis/internal/jaxb/lan/Country.java | 6 +-- .../apache/sis/internal/jaxb/lan/LanguageCode.java | 6 +-- .../sis/internal/jaxb/lan/LocaleAdapter.java | 6 +-- .../jaxb/lan/LocalisedCharacterString.java | 6 +-- .../apache/sis/internal/jaxb/lan/PT_FreeText.java | 8 ++-- .../apache/sis/internal/jaxb/lan/PT_Locale.java | 14 +++--- .../apache/sis/internal/jaxb/lan/TextGroup.java | 4 +- .../apache/sis/internal/jaxb/lan/package-info.java | 14 +++--- .../sis/internal/jaxb/metadata/CI_Address.java | 4 +- .../sis/internal/jaxb/metadata/CI_Citation.java | 4 +- .../sis/internal/jaxb/metadata/CI_Contact.java | 4 +- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 4 +- .../internal/jaxb/metadata/CI_OnlineResource.java | 4 +- .../sis/internal/jaxb/metadata/CI_Party.java | 4 +- .../internal/jaxb/metadata/CI_Responsibility.java | 2 +- .../jaxb/metadata/CI_ResponsibleParty.java | 4 +- .../sis/internal/jaxb/metadata/CI_Series.java | 4 +- .../sis/internal/jaxb/metadata/CI_Telephone.java | 4 +- .../internal/jaxb/metadata/DQM_BasicMeasure.java | 4 +- .../internal/jaxb/metadata/DQM_Description.java | 4 +- .../sis/internal/jaxb/metadata/DQM_Measure.java | 4 +- .../sis/internal/jaxb/metadata/DQM_Parameter.java | 4 +- .../jaxb/metadata/DQM_SourceReference.java | 4 +- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 4 +- .../sis/internal/jaxb/metadata/DQ_Element.java | 4 +- .../jaxb/metadata/DQ_EvaluationMethod.java | 4 +- .../jaxb/metadata/DQ_MeasureReference.java | 4 +- .../jaxb/metadata/DQ_PositionalAccuracy.java | 4 +- .../sis/internal/jaxb/metadata/DQ_Result.java | 4 +- .../DQ_StandaloneQualityReportInformation.java | 4 +- .../sis/internal/jaxb/metadata/EX_Extent.java | 4 +- .../jaxb/metadata/EX_GeographicExtent.java | 4 +- .../internal/jaxb/metadata/EX_TemporalExtent.java | 4 +- .../internal/jaxb/metadata/EX_VerticalExtent.java | 4 +- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 4 +- .../jaxb/metadata/LE_NominalResolution.java | 4 +- .../jaxb/metadata/LE_ProcessStepReport.java | 4 +- .../sis/internal/jaxb/metadata/LE_Processing.java | 4 +- .../sis/internal/jaxb/metadata/LI_Lineage.java | 4 +- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 4 +- .../sis/internal/jaxb/metadata/LI_Source.java | 4 +- .../jaxb/metadata/MD_AggregateInformation.java | 4 +- .../metadata/MD_ApplicationSchemaInformation.java | 4 +- .../jaxb/metadata/MD_AssociatedResource.java | 4 +- .../internal/jaxb/metadata/MD_AttributeGroup.java | 4 +- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 4 +- .../sis/internal/jaxb/metadata/MD_Constraints.java | 4 +- .../jaxb/metadata/MD_ContentInformation.java | 4 +- .../jaxb/metadata/MD_DataIdentification.java | 4 +- .../jaxb/metadata/MD_DigitalTransferOptions.java | 4 +- .../sis/internal/jaxb/metadata/MD_Dimension.java | 4 +- .../internal/jaxb/metadata/MD_Distribution.java | 4 +- .../sis/internal/jaxb/metadata/MD_Distributor.java | 4 +- .../metadata/MD_ExtendedElementInformation.java | 4 +- .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 4 +- .../sis/internal/jaxb/metadata/MD_Format.java | 4 +- .../jaxb/metadata/MD_GeometricObjects.java | 4 +- .../internal/jaxb/metadata/MD_Identification.java | 4 +- .../sis/internal/jaxb/metadata/MD_Identifier.java | 4 +- .../internal/jaxb/metadata/MD_KeywordClass.java | 4 +- .../sis/internal/jaxb/metadata/MD_Keywords.java | 4 +- .../jaxb/metadata/MD_MaintenanceInformation.java | 4 +- .../sis/internal/jaxb/metadata/MD_Medium.java | 4 +- .../sis/internal/jaxb/metadata/MD_Metadata.java | 4 +- .../metadata/MD_MetadataExtensionInformation.java | 4 +- .../internal/jaxb/metadata/MD_MetadataScope.java | 4 +- .../metadata/MD_PortrayalCatalogueReference.java | 4 +- .../internal/jaxb/metadata/MD_RangeDimension.java | 4 +- .../internal/jaxb/metadata/MD_Releasability.java | 4 +- .../jaxb/metadata/MD_RepresentativeFraction.java | 4 +- .../sis/internal/jaxb/metadata/MD_Resolution.java | 4 +- .../sis/internal/jaxb/metadata/MD_Scope.java | 4 +- .../jaxb/metadata/MD_ScopeDescription.java | 4 +- .../jaxb/metadata/MD_SpatialRepresentation.java | 4 +- .../jaxb/metadata/MD_StandardOrderProcess.java | 4 +- .../sis/internal/jaxb/metadata/MD_Usage.java | 4 +- .../jaxb/metadata/MI_AcquisitionInformation.java | 4 +- .../jaxb/metadata/MI_EnvironmentalRecord.java | 4 +- .../sis/internal/jaxb/metadata/MI_Event.java | 4 +- .../apache/sis/internal/jaxb/metadata/MI_GCP.java | 4 +- .../jaxb/metadata/MI_GeolocationInformation.java | 4 +- .../sis/internal/jaxb/metadata/MI_Instrument.java | 4 +- .../sis/internal/jaxb/metadata/MI_Objective.java | 4 +- .../sis/internal/jaxb/metadata/MI_Operation.java | 4 +- .../apache/sis/internal/jaxb/metadata/MI_Plan.java | 4 +- .../sis/internal/jaxb/metadata/MI_Platform.java | 4 +- .../internal/jaxb/metadata/MI_PlatformPass.java | 4 +- .../jaxb/metadata/MI_RangeElementDescription.java | 4 +- .../internal/jaxb/metadata/MI_RequestedDate.java | 4 +- .../sis/internal/jaxb/metadata/MI_Requirement.java | 4 +- .../sis/internal/jaxb/metadata/MX_DataFile.java | 4 +- .../internal/jaxb/metadata/RS_ReferenceSystem.java | 4 +- .../internal/jaxb/metadata/SV_CoupledResource.java | 4 +- .../jaxb/metadata/SV_OperationChainMetadata.java | 4 +- .../jaxb/metadata/SV_OperationMetadata.java | 4 +- .../sis/internal/jaxb/metadata/SV_Parameter.java | 4 +- .../sis/internal/jaxb/metadata/package-info.java | 12 ++--- .../jaxb/metadata/replace/QualityParameter.java | 10 ++--- .../jaxb/metadata/replace/RS_Identifier.java | 6 +-- .../metadata/replace/ReferenceSystemMetadata.java | 12 ++--- .../jaxb/metadata/replace/ServiceParameter.java | 10 ++--- .../jaxb/metadata/replace/package-info.java | 14 +++--- .../org/apache/sis/metadata/AbstractMetadata.java | 4 +- .../apache/sis/metadata/ModifiableMetadata.java | 6 +-- .../apache/sis/metadata/PropertyComparator.java | 4 +- .../iso/DefaultApplicationSchemaInformation.java | 10 ++--- .../iso/DefaultExtendedElementInformation.java | 8 ++-- .../apache/sis/metadata/iso/DefaultIdentifier.java | 10 ++--- .../apache/sis/metadata/iso/DefaultMetadata.java | 18 ++++---- .../iso/DefaultMetadataExtensionInformation.java | 8 ++-- .../sis/metadata/iso/DefaultMetadataScope.java | 8 ++-- .../iso/DefaultPortrayalCatalogueReference.java | 8 ++-- .../org/apache/sis/metadata/iso/ISOMetadata.java | 14 +++--- .../sis/metadata/iso/OnlineResourceAdapter.java | 2 +- .../apache/sis/metadata/iso/URIStringAdapter.java | 2 +- .../acquisition/DefaultAcquisitionInformation.java | 8 ++-- .../acquisition/DefaultEnvironmentalRecord.java | 8 ++-- .../sis/metadata/iso/acquisition/DefaultEvent.java | 8 ++-- .../iso/acquisition/DefaultInstrument.java | 8 ++-- .../metadata/iso/acquisition/DefaultObjective.java | 8 ++-- .../metadata/iso/acquisition/DefaultOperation.java | 8 ++-- .../sis/metadata/iso/acquisition/DefaultPlan.java | 8 ++-- .../metadata/iso/acquisition/DefaultPlatform.java | 8 ++-- .../iso/acquisition/DefaultPlatformPass.java | 8 ++-- .../iso/acquisition/DefaultRequestedDate.java | 8 ++-- .../iso/acquisition/DefaultRequirement.java | 8 ++-- .../sis/metadata/iso/acquisition/package-info.java | 16 +++---- .../sis/metadata/iso/citation/AbstractParty.java | 10 ++--- .../sis/metadata/iso/citation/DefaultAddress.java | 8 ++-- .../sis/metadata/iso/citation/DefaultCitation.java | 8 ++-- .../metadata/iso/citation/DefaultCitationDate.java | 8 ++-- .../sis/metadata/iso/citation/DefaultContact.java | 10 ++--- .../metadata/iso/citation/DefaultIndividual.java | 8 ++-- .../iso/citation/DefaultOnlineResource.java | 10 ++--- .../metadata/iso/citation/DefaultOrganisation.java | 8 ++-- .../iso/citation/DefaultResponsibility.java | 12 ++--- .../iso/citation/DefaultResponsibleParty.java | 8 ++-- .../sis/metadata/iso/citation/DefaultSeries.java | 8 ++-- .../metadata/iso/citation/DefaultTelephone.java | 10 ++--- .../sis/metadata/iso/citation/package-info.java | 16 +++---- .../iso/constraint/DefaultConstraints.java | 12 ++--- .../iso/constraint/DefaultLegalConstraints.java | 8 ++-- .../iso/constraint/DefaultReleasability.java | 6 +-- .../iso/constraint/DefaultSecurityConstraints.java | 8 ++-- .../sis/metadata/iso/constraint/package-info.java | 14 +++--- .../iso/content/AbstractContentInformation.java | 8 ++-- .../iso/content/DefaultAttributeGroup.java | 8 ++-- .../sis/metadata/iso/content/DefaultBand.java | 12 ++--- .../iso/content/DefaultCoverageDescription.java | 12 ++--- .../DefaultFeatureCatalogueDescription.java | 8 ++-- .../iso/content/DefaultFeatureTypeInfo.java | 8 ++-- .../iso/content/DefaultImageDescription.java | 10 ++--- .../iso/content/DefaultRangeDimension.java | 12 ++--- .../content/DefaultRangeElementDescription.java | 8 ++-- .../iso/content/DefaultSampleDimension.java | 12 ++--- .../sis/metadata/iso/content/package-info.java | 16 +++---- .../metadata/iso/distribution/DefaultDataFile.java | 10 ++--- .../DefaultDigitalTransferOptions.java | 10 ++--- .../iso/distribution/DefaultDistribution.java | 10 ++--- .../iso/distribution/DefaultDistributor.java | 8 ++-- .../metadata/iso/distribution/DefaultFormat.java | 10 ++--- .../metadata/iso/distribution/DefaultMedium.java | 10 ++--- .../distribution/DefaultStandardOrderProcess.java | 10 ++--- .../metadata/iso/distribution/package-info.java | 16 +++---- .../iso/extent/AbstractGeographicExtent.java | 10 ++--- .../iso/extent/DefaultBoundingPolygon.java | 8 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 8 ++-- .../iso/extent/DefaultGeographicBoundingBox.java | 8 ++-- .../iso/extent/DefaultGeographicDescription.java | 8 ++-- .../iso/extent/DefaultSpatialTemporalExtent.java | 8 ++-- .../metadata/iso/extent/DefaultTemporalExtent.java | 10 ++--- .../metadata/iso/extent/DefaultVerticalExtent.java | 10 ++--- .../sis/metadata/iso/extent/package-info.java | 16 +++---- .../iso/identification/AbstractIdentification.java | 12 ++--- .../DefaultAggregateInformation.java | 10 ++--- .../identification/DefaultAssociatedResource.java | 10 ++--- .../iso/identification/DefaultBrowseGraphic.java | 10 ++--- .../iso/identification/DefaultCoupledResource.java | 12 ++--- .../identification/DefaultDataIdentification.java | 8 ++-- .../iso/identification/DefaultKeywordClass.java | 8 ++-- .../iso/identification/DefaultKeywords.java | 10 ++--- .../DefaultOperationChainMetadata.java | 8 ++-- .../identification/DefaultOperationMetadata.java | 8 ++-- .../DefaultRepresentativeFraction.java | 18 ++++---- .../iso/identification/DefaultResolution.java | 10 ++--- .../DefaultServiceIdentification.java | 10 ++--- .../metadata/iso/identification/DefaultUsage.java | 8 ++-- .../metadata/iso/identification/package-info.java | 16 +++---- .../sis/metadata/iso/lineage/DefaultAlgorithm.java | 8 ++-- .../sis/metadata/iso/lineage/DefaultLineage.java | 10 ++--- .../iso/lineage/DefaultNominalResolution.java | 8 ++-- .../metadata/iso/lineage/DefaultProcessStep.java | 12 ++--- .../iso/lineage/DefaultProcessStepReport.java | 8 ++-- .../metadata/iso/lineage/DefaultProcessing.java | 8 ++-- .../sis/metadata/iso/lineage/DefaultSource.java | 12 ++--- .../sis/metadata/iso/lineage/package-info.java | 16 +++---- .../iso/maintenance/AttributeTypeAdapter.java | 2 +- .../maintenance/DefaultMaintenanceInformation.java | 8 ++-- .../sis/metadata/iso/maintenance/DefaultScope.java | 8 ++-- .../iso/maintenance/DefaultScopeDescription.java | 8 ++-- .../iso/maintenance/FeatureTypeAdapter.java | 2 +- .../sis/metadata/iso/maintenance/package-info.java | 16 +++---- .../org/apache/sis/metadata/iso/package-info.java | 16 +++---- .../metadata/iso/quality/AbstractCompleteness.java | 8 ++-- .../iso/quality/AbstractDataEvaluation.java | 8 ++-- .../sis/metadata/iso/quality/AbstractElement.java | 12 ++--- .../iso/quality/AbstractLogicalConsistency.java | 8 ++-- .../metadata/iso/quality/AbstractMetaquality.java | 8 ++-- .../iso/quality/AbstractPositionalAccuracy.java | 8 ++-- .../sis/metadata/iso/quality/AbstractResult.java | 12 ++--- .../iso/quality/AbstractTemporalAccuracy.java | 6 +-- .../iso/quality/AbstractTemporalQuality.java | 8 ++-- .../iso/quality/AbstractThematicAccuracy.java | 8 ++-- .../DefaultAbsoluteExternalPositionalAccuracy.java | 6 +-- .../quality/DefaultAccuracyOfATimeMeasurement.java | 6 +-- .../iso/quality/DefaultAggregationDerivation.java | 6 +-- .../metadata/iso/quality/DefaultBasicMeasure.java | 8 ++-- .../iso/quality/DefaultCompletenessCommission.java | 6 +-- .../iso/quality/DefaultCompletenessOmission.java | 6 +-- .../iso/quality/DefaultConceptualConsistency.java | 6 +-- .../metadata/iso/quality/DefaultConfidence.java | 6 +-- .../iso/quality/DefaultConformanceResult.java | 8 ++-- .../iso/quality/DefaultCoverageResult.java | 8 ++-- .../metadata/iso/quality/DefaultDataQuality.java | 8 ++-- .../iso/quality/DefaultDescriptiveResult.java | 8 ++-- .../iso/quality/DefaultDomainConsistency.java | 6 +-- .../iso/quality/DefaultEvaluationMethod.java | 10 ++--- .../DefaultEvaluationReportInformation.java | 8 ++-- .../iso/quality/DefaultFormatConsistency.java | 6 +-- .../iso/quality/DefaultFullInspection.java | 6 +-- .../DefaultGriddedDataPositionalAccuracy.java | 6 +-- .../metadata/iso/quality/DefaultHomogeneity.java | 6 +-- .../iso/quality/DefaultIndirectEvaluation.java | 8 ++-- .../iso/quality/DefaultMeasureDescription.java | 8 ++-- .../iso/quality/DefaultMeasureReference.java | 8 ++-- .../DefaultNonQuantitativeAttributeAccuracy.java | 6 +-- ...DefaultNonQuantitativeAttributeCorrectness.java | 8 ++-- .../iso/quality/DefaultQualityMeasure.java | 8 ++-- .../DefaultQuantitativeAttributeAccuracy.java | 6 +-- .../iso/quality/DefaultQuantitativeResult.java | 8 ++-- .../DefaultRelativeInternalPositionalAccuracy.java | 6 +-- .../iso/quality/DefaultRepresentativity.java | 6 +-- .../iso/quality/DefaultSampleBasedInspection.java | 8 ++-- .../sis/metadata/iso/quality/DefaultScope.java | 4 +- .../iso/quality/DefaultSourceReference.java | 8 ++-- .../iso/quality/DefaultTemporalConsistency.java | 6 +-- .../iso/quality/DefaultTemporalValidity.java | 6 +-- .../DefaultThematicClassificationCorrectness.java | 6 +-- .../iso/quality/DefaultTopologicalConsistency.java | 6 +-- .../sis/metadata/iso/quality/DefaultUsability.java | 6 +-- .../sis/metadata/iso/quality/package-info.java | 16 +++---- .../spatial/AbstractGeolocationInformation.java | 10 ++--- .../iso/spatial/AbstractSpatialRepresentation.java | 12 ++--- .../sis/metadata/iso/spatial/DefaultDimension.java | 10 ++--- .../sis/metadata/iso/spatial/DefaultGCP.java | 8 ++-- .../metadata/iso/spatial/DefaultGCPCollection.java | 8 ++-- .../iso/spatial/DefaultGeometricObjects.java | 8 ++-- .../metadata/iso/spatial/DefaultGeorectified.java | 10 ++--- .../iso/spatial/DefaultGeoreferenceable.java | 10 ++--- .../spatial/DefaultGridSpatialRepresentation.java | 10 ++--- .../DefaultVectorSpatialRepresentation.java | 8 ++-- .../sis/metadata/iso/spatial/package-info.java | 16 +++---- .../java/org/apache/sis/util/iso/AbstractName.java | 6 +-- .../org/apache/sis/util/iso/DefaultLocalName.java | 8 ++-- .../org/apache/sis/util/iso/DefaultMemberName.java | 8 ++-- .../org/apache/sis/util/iso/DefaultRecord.java | 4 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 6 +-- .../org/apache/sis/util/iso/DefaultScopedName.java | 4 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 4 +- .../org/apache/sis/util/iso/RecordDefinition.java | 4 +- .../java/org/apache/sis/util/iso/package-info.java | 14 +++--- .../java/org/apache/sis/xml/IdentifierSpace.java | 4 +- .../java/org/apache/sis/xml/Implementation.java | 2 +- .../java/org/apache/sis/xml/MarshallerPool.java | 8 ++-- .../src/main/java/org/apache/sis/xml/Pooled.java | 22 +++++---- .../java/org/apache/sis/xml/PooledMarshaller.java | 22 +++++---- .../java/org/apache/sis/xml/PooledTemplate.java | 9 ++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 52 +++++----------------- .../src/main/java/org/apache/sis/xml/XLink.java | 16 +++---- .../src/main/java/org/apache/sis/xml/XML.java | 12 ++--- .../main/java/org/apache/sis/xml/package-info.java | 2 +- .../internal/jaxb/cat/CodeListMarshallingTest.java | 6 +-- .../sis/internal/jaxb/cat/EnumMarshallingTest.java | 4 +- .../sis/internal/jaxb/gco/MultiplicityTest.java | 6 +-- .../sis/internal/jaxb/gml/TimePeriodTest.java | 10 ++--- .../internal/jaxb/lan/FreeTextMarshallingTest.java | 4 +- .../sis/internal/jaxb/lan/LanguageCodeTest.java | 10 ++--- .../sis/internal/jaxb/lan/PT_LocaleTest.java | 4 +- .../metadata/replace/QualityParameterTest.java | 4 +- .../metadata/replace/ServiceParameterTest.java | 4 +- .../sis/metadata/iso/CustomMetadataTest.java | 4 +- .../sis/metadata/iso/DefaultIdentifierTest.java | 4 +- .../sis/metadata/iso/DefaultMetadataTest.java | 4 +- .../metadata/iso/citation/DefaultCitationTest.java | 4 +- .../iso/citation/DefaultResponsibilityTest.java | 4 +- .../constraint/DefaultLegalConstraintsTest.java | 4 +- .../sis/metadata/iso/content/DefaultBandTest.java | 4 +- .../sis/metadata/iso/extent/DefaultExtentTest.java | 4 +- .../identification/DefaultBrowseGraphicTest.java | 6 +-- .../DefaultRepresentativeFractionTest.java | 4 +- .../iso/identification/DefaultResolutionTest.java | 4 +- .../DefaultServiceIdentificationTest.java | 4 +- .../metadata/iso/lineage/DefaultLineageTest.java | 4 +- .../iso/lineage/DefaultProcessStepTest.java | 4 +- .../quality/AbstractPositionalAccuracyTest.java | 4 +- .../iso/quality/DefaultQuantitativeResultTest.java | 4 +- .../sis/metadata/iso/quality/ScopeCodeTest.java | 4 +- .../apache/sis/test/mock/FeatureAttributeMock.java | 8 ++-- .../apache/sis/test/mock/IdentifiedObjectMock.java | 8 ++-- .../org/apache/sis/test/mock/MetadataMock.java | 8 ++-- .../org/apache/sis/test/mock/package-info.java | 16 +++---- .../sis/test/xml/AnnotationConsistencyCheck.java | 18 ++++---- .../org/apache/sis/test/xml/PackageVerifier.java | 16 +++---- .../org/apache/sis/test/xml/SchemaCompliance.java | 6 +-- .../java/org/apache/sis/test/xml/TestCase.java | 8 ++-- .../apache/sis/util/iso/NameMarshallingTest.java | 10 ++--- .../sis/xml/CharSequenceSubstitutionTest.java | 4 +- .../org/apache/sis/xml/MarshallerPoolTest.java | 16 +++---- .../apache/sis/xml/NilReasonMarshallingTest.java | 4 +- .../org/apache/sis/xml/RenameListGenerator.java | 6 +-- .../org/apache/sis/xml/UUIDMarshallingTest.java | 4 +- .../org/apache/sis/xml/XLinkMarshallingTest.java | 4 +- .../gazetteer/GeohashReferenceSystem.java | 6 +-- .../gazetteer/MilitaryGridReferenceSystem.java | 8 ++-- .../gazetteer/ReferencingByIdentifiers.java | 4 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 4 +- .../internal/jaxb/referencing/CC_Conversion.java | 4 +- .../jaxb/referencing/CC_CoordinateOperation.java | 4 +- .../referencing/CC_GeneralOperationParameter.java | 4 +- .../jaxb/referencing/CC_GeneralParameterValue.java | 6 +-- .../jaxb/referencing/CC_OperationMethod.java | 4 +- .../jaxb/referencing/CC_OperationParameter.java | 6 +-- .../referencing/CC_OperationParameterGroup.java | 4 +- .../internal/jaxb/referencing/CD_Ellipsoid.java | 4 +- .../jaxb/referencing/CD_EngineeringDatum.java | 4 +- .../jaxb/referencing/CD_GeodeticDatum.java | 4 +- .../internal/jaxb/referencing/CD_ImageDatum.java | 4 +- .../jaxb/referencing/CD_ParametricDatum.java | 4 +- .../jaxb/referencing/CD_PrimeMeridian.java | 4 +- .../jaxb/referencing/CD_TemporalDatum.java | 4 +- .../jaxb/referencing/CD_VerticalDatum.java | 4 +- .../sis/internal/jaxb/referencing/CS_AffineCS.java | 4 +- .../internal/jaxb/referencing/CS_CartesianCS.java | 4 +- .../jaxb/referencing/CS_CoordinateSystem.java | 4 +- .../jaxb/referencing/CS_CoordinateSystemAxis.java | 4 +- .../jaxb/referencing/CS_CylindricalCS.java | 4 +- .../jaxb/referencing/CS_EllipsoidalCS.java | 4 +- .../sis/internal/jaxb/referencing/CS_LinearCS.java | 4 +- .../internal/jaxb/referencing/CS_ParametricCS.java | 4 +- .../sis/internal/jaxb/referencing/CS_PolarCS.java | 4 +- .../internal/jaxb/referencing/CS_SphericalCS.java | 4 +- .../sis/internal/jaxb/referencing/CS_TimeCS.java | 4 +- .../jaxb/referencing/CS_UserDefinedCS.java | 4 +- .../internal/jaxb/referencing/CS_VerticalCS.java | 4 +- .../apache/sis/internal/jaxb/referencing/Code.java | 8 ++-- .../internal/jaxb/referencing/RS_Identifier.java | 4 +- .../sis/internal/jaxb/referencing/SC_CRS.java | 4 +- .../jaxb/referencing/SC_DerivedCRSType.java | 6 +-- .../internal/jaxb/referencing/SC_SingleCRS.java | 4 +- .../internal/jaxb/referencing/SC_VerticalCRS.java | 6 +-- .../jaxb/referencing/SecondDefiningParameter.java | 6 +-- .../internal/jaxb/referencing/package-info.java | 14 +++--- .../referencing/PositionalAccuracyConstant.java | 4 +- .../referencing/provider/AbridgedMolodensky.java | 4 +- .../referencing/provider/AbstractLambert.java | 4 +- .../referencing/provider/AbstractMercator.java | 4 +- .../referencing/provider/AbstractProvider.java | 2 +- .../provider/AbstractStereographic.java | 4 +- .../sis/internal/referencing/provider/Affine.java | 4 +- .../referencing/provider/AlbersEqualArea.java | 4 +- .../referencing/provider/AxisOrderReversal.java | 4 +- .../referencing/provider/AxisOrderReversal3D.java | 4 +- .../provider/AzimuthalEquidistantSpherical.java | 4 +- .../referencing/provider/CassiniSoldner.java | 4 +- .../provider/CoordinateFrameRotation.java | 4 +- .../provider/CoordinateFrameRotation2D.java | 4 +- .../provider/CoordinateFrameRotation3D.java | 4 +- .../referencing/provider/Equirectangular.java | 2 +- .../provider/FranceGeocentricInterpolation.java | 2 +- .../referencing/provider/GeocentricAffine.java | 2 +- .../GeocentricAffineBetweenGeographic.java | 4 +- .../provider/GeocentricTranslation.java | 4 +- .../provider/GeocentricTranslation2D.java | 4 +- .../provider/GeocentricTranslation3D.java | 4 +- .../referencing/provider/GeodeticOperation.java | 4 +- .../referencing/provider/Geographic2Dto3D.java | 4 +- .../referencing/provider/Geographic3Dto2D.java | 4 +- .../provider/GeographicAndVerticalOffsets.java | 4 +- .../referencing/provider/GeographicOffsets.java | 4 +- .../referencing/provider/GeographicOffsets2D.java | 4 +- .../provider/GeographicRedimension.java | 4 +- .../provider/HyperbolicCassiniSoldner.java | 4 +- .../provider/LambertAzimuthalEqualArea.java | 4 +- .../LambertAzimuthalEqualAreaSpherical.java | 4 +- .../referencing/provider/LambertConformal1SP.java | 4 +- .../referencing/provider/LambertConformal2SP.java | 4 +- .../provider/LambertConformalBelgium.java | 4 +- .../provider/LambertConformalMichigan.java | 4 +- .../referencing/provider/LambertConformalWest.java | 4 +- .../provider/LambertCylindricalEqualArea.java | 4 +- .../LambertCylindricalEqualAreaSpherical.java | 4 +- .../referencing/provider/LongitudeRotation.java | 4 +- .../referencing/provider/MapProjection.java | 4 +- .../referencing/provider/MapProjection3D.java | 4 +- .../internal/referencing/provider/Mercator1SP.java | 4 +- .../internal/referencing/provider/Mercator2SP.java | 4 +- .../provider/MercatorAuxiliarySphere.java | 4 +- .../referencing/provider/MercatorSpherical.java | 4 +- .../referencing/provider/MillerCylindrical.java | 4 +- .../provider/ModifiedAzimuthalEquidistant.java | 4 +- .../internal/referencing/provider/Mollweide.java | 4 +- .../internal/referencing/provider/Molodensky.java | 4 +- .../provider/MolodenskyInterpolation.java | 4 +- .../sis/internal/referencing/provider/NADCON.java | 4 +- .../sis/internal/referencing/provider/NTv1.java | 4 +- .../sis/internal/referencing/provider/NTv2.java | 4 +- .../referencing/provider/NorthPoleRotation.java | 4 +- .../referencing/provider/ObliqueMercator.java | 4 +- .../provider/ObliqueMercatorCenter.java | 4 +- .../provider/ObliqueMercatorTwoPoints.java | 4 +- .../provider/ObliqueMercatorTwoPointsCenter.java | 4 +- .../referencing/provider/ObliqueStereographic.java | 4 +- .../referencing/provider/Orthographic.java | 4 +- .../referencing/provider/PolarStereographicA.java | 4 +- .../referencing/provider/PolarStereographicB.java | 2 +- .../referencing/provider/PolarStereographicC.java | 4 +- .../provider/PolarStereographicNorth.java | 4 +- .../provider/PolarStereographicSouth.java | 4 +- .../internal/referencing/provider/Polyconic.java | 4 +- .../referencing/provider/PositionVector7Param.java | 4 +- .../provider/PositionVector7Param2D.java | 4 +- .../provider/PositionVector7Param3D.java | 4 +- .../referencing/provider/PseudoMercator.java | 4 +- .../referencing/provider/PseudoPlateCarree.java | 4 +- .../referencing/provider/PseudoSinusoidal.java | 4 +- .../referencing/provider/RegionalMercator.java | 4 +- .../referencing/provider/SatelliteTracking.java | 4 +- .../internal/referencing/provider/Sinusoidal.java | 4 +- .../referencing/provider/SouthPoleRotation.java | 4 +- .../referencing/provider/TransverseMercator.java | 6 +-- .../provider/TransverseMercatorSouth.java | 4 +- .../referencing/provider/VerticalOffset.java | 4 +- .../internal/referencing/provider/Wraparound.java | 4 +- .../provider/ZonedTransverseMercator.java | 4 +- .../org/apache/sis/io/wkt/FormattableObject.java | 4 +- .../sis/parameter/AbstractParameterDescriptor.java | 10 ++--- .../sis/parameter/DefaultParameterDescriptor.java | 6 +-- .../parameter/DefaultParameterDescriptorGroup.java | 8 ++-- .../sis/parameter/DefaultParameterValue.java | 8 ++-- .../sis/parameter/DefaultParameterValueGroup.java | 8 ++-- .../java/org/apache/sis/parameter/IntegerList.java | 4 +- .../sis/parameter/MapProjectionDescriptor.java | 4 +- .../java/org/apache/sis/parameter/Parameters.java | 4 +- .../org/apache/sis/parameter/TensorValues.java | 4 +- .../sis/parameter/UnmodifiableParameterValue.java | 4 +- .../org/apache/sis/parameter/package-info.java | 14 +++--- .../sis/referencing/AbstractIdentifiedObject.java | 18 ++++---- .../sis/referencing/AbstractReferenceSystem.java | 8 ++-- .../apache/sis/referencing/crs/AbstractCRS.java | 8 ++-- .../sis/referencing/crs/AbstractDerivedCRS.java | 12 ++--- .../sis/referencing/crs/DefaultCompoundCRS.java | 10 ++--- .../sis/referencing/crs/DefaultDerivedCRS.java | 12 ++--- .../sis/referencing/crs/DefaultEngineeringCRS.java | 10 ++--- .../sis/referencing/crs/DefaultGeocentricCRS.java | 4 +- .../sis/referencing/crs/DefaultGeodeticCRS.java | 8 ++-- .../sis/referencing/crs/DefaultGeographicCRS.java | 4 +- .../sis/referencing/crs/DefaultImageCRS.java | 8 ++-- .../sis/referencing/crs/DefaultParametricCRS.java | 8 ++-- .../sis/referencing/crs/DefaultProjectedCRS.java | 8 ++-- .../sis/referencing/crs/DefaultTemporalCRS.java | 8 ++-- .../sis/referencing/crs/DefaultVerticalCRS.java | 8 ++-- .../sis/referencing/crs/SC_GeographicCRS.java | 4 +- .../apache/sis/referencing/crs/package-info.java | 14 +++--- .../org/apache/sis/referencing/cs/AbstractCS.java | 8 ++-- .../apache/sis/referencing/cs/DefaultAffineCS.java | 6 +-- .../sis/referencing/cs/DefaultCartesianCS.java | 6 +-- .../sis/referencing/cs/DefaultCompoundCS.java | 4 +- .../cs/DefaultCoordinateSystemAxis.java | 10 ++--- .../sis/referencing/cs/DefaultCylindricalCS.java | 6 +-- .../sis/referencing/cs/DefaultEllipsoidalCS.java | 6 +-- .../apache/sis/referencing/cs/DefaultLinearCS.java | 6 +-- .../sis/referencing/cs/DefaultParametricCS.java | 6 +-- .../apache/sis/referencing/cs/DefaultPolarCS.java | 6 +-- .../sis/referencing/cs/DefaultSphericalCS.java | 6 +-- .../apache/sis/referencing/cs/DefaultTimeCS.java | 6 +-- .../sis/referencing/cs/DefaultUserDefinedCS.java | 6 +-- .../sis/referencing/cs/DefaultVerticalCS.java | 6 +-- .../apache/sis/referencing/cs/package-info.java | 14 +++--- .../sis/referencing/datum/AbstractDatum.java | 12 ++--- .../sis/referencing/datum/DefaultEllipsoid.java | 8 ++-- .../referencing/datum/DefaultEngineeringDatum.java | 6 +-- .../referencing/datum/DefaultGeodeticDatum.java | 6 +-- .../sis/referencing/datum/DefaultImageDatum.java | 8 ++-- .../referencing/datum/DefaultParametricDatum.java | 6 +-- .../referencing/datum/DefaultPrimeMeridian.java | 8 ++-- .../referencing/datum/DefaultTemporalDatum.java | 12 ++--- .../referencing/datum/DefaultVerticalDatum.java | 8 ++-- .../org/apache/sis/referencing/datum/Sphere.java | 4 +- .../apache/sis/referencing/datum/package-info.java | 14 +++--- .../referencing/factory/GeodeticObjectFactory.java | 2 +- .../operation/AbstractCoordinateOperation.java | 10 ++--- .../operation/AbstractSingleOperation.java | 12 ++--- .../operation/DefaultConcatenatedOperation.java | 8 ++-- .../operation/DefaultConicProjection.java | 4 +- .../referencing/operation/DefaultConversion.java | 6 +-- .../operation/DefaultCylindricalProjection.java | 4 +- .../operation/DefaultOperationMethod.java | 12 ++--- .../operation/DefaultPassThroughOperation.java | 8 ++-- .../operation/DefaultPlanarProjection.java | 4 +- .../referencing/operation/DefaultProjection.java | 4 +- .../operation/DefaultTransformation.java | 6 +-- .../operation/InverseOperationMethod.java | 4 +- .../sis/referencing/operation/package-info.java | 14 +++--- .../org/apache/sis/referencing/package-info.java | 14 +++--- .../CC_GeneralOperationParameterTest.java | 4 +- .../CC_OperationParameterGroupTest.java | 4 +- .../referencing/SecondDefiningParameterTest.java | 4 +- .../sis/parameter/ParameterMarshallingTest.java | 4 +- .../sis/referencing/ImmutableIdentifierTest.java | 4 +- .../referencing/crs/DefaultCompoundCRSTest.java | 4 +- .../sis/referencing/crs/DefaultDerivedCRSTest.java | 4 +- .../referencing/crs/DefaultEngineeringCRSTest.java | 4 +- .../referencing/crs/DefaultGeodeticCRSTest.java | 4 +- .../sis/referencing/crs/DefaultImageCRSTest.java | 4 +- .../referencing/crs/DefaultProjectedCRSTest.java | 4 +- .../sis/referencing/cs/DefaultCartesianCSTest.java | 4 +- .../referencing/cs/DefaultEllipsoidalCSTest.java | 4 +- .../referencing/datum/DefaultEllipsoidTest.java | 2 +- .../datum/DefaultGeodeticDatumTest.java | 4 +- .../datum/DefaultPrimeMeridianTest.java | 8 ++-- .../datum/DefaultTemporalDatumTest.java | 4 +- .../datum/DefaultVerticalDatumTest.java | 8 ++-- .../DefaultConcatenatedOperationTest.java | 4 +- .../operation/DefaultPassThroughOperationTest.java | 4 +- .../operation/SingleOperationMarshallingTest.java | 4 +- .../apache/sis/test/integration/MetadataTest.java | 8 ++-- .../sis/test/integration/MetadataVerticalTest.java | 4 +- .../main/java/org/apache/sis/setup/OptionKey.java | 6 +-- ide-project/NetBeans/nbproject/project.properties | 6 +-- pom.xml | 4 +- .../sis/internal/profile/fra/Constraints.java | 8 ++-- .../internal/profile/fra/DataIdentification.java | 8 ++-- .../profile/fra/DirectReferenceSystem.java | 6 +-- .../profile/fra/IndirectReferenceSystem.java | 6 +-- .../sis/internal/profile/fra/LegalConstraints.java | 8 ++-- .../internal/profile/fra/SecurityConstraints.java | 8 ++-- .../sis/internal/profile/fra/package-info.java | 16 +++---- .../profile/fra/DataIdentificationTest.java | 4 +- .../profile/fra/DirectReferenceSystemTest.java | 4 +- .../apache/sis/storage/geotiff/XMLMetadata.java | 4 +- .../internal/storage/xml/GeographicEnvelope.java | 4 +- .../org/apache/sis/internal/storage/xml/Store.java | 2 +- .../apache/sis/internal/storage/gpx/Bounds.java | 4 +- .../apache/sis/internal/storage/gpx/Copyright.java | 6 +-- .../org/apache/sis/internal/storage/gpx/Email.java | 6 +-- .../org/apache/sis/internal/storage/gpx/Link.java | 8 ++-- .../apache/sis/internal/storage/gpx/Metadata.java | 6 +-- .../apache/sis/internal/storage/gpx/Person.java | 6 +-- .../apache/sis/internal/storage/gpx/Reader.java | 4 +- .../sis/internal/storage/gpx/StoreProvider.java | 4 +- .../apache/sis/internal/storage/gpx/Writer.java | 4 +- .../sis/internal/storage/gpx/package-info.java | 12 ++--- .../storage/xml/stream/StaxDataStoreProvider.java | 4 +- .../internal/storage/xml/stream/StaxStreamIO.java | 4 +- .../storage/xml/stream/StaxStreamReader.java | 18 ++++---- .../storage/xml/stream/StaxStreamWriter.java | 12 ++--- 674 files changed, 2172 insertions(+), 2207 deletions(-) diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java index aed9128316,a81a5c8cb5..325db9a705 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java @@@ -16,8 -16,7 +16,8 @@@ */ package org.apache.sis.internal.jaxb.code; - import javax.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlElement; +import org.opengis.metadata.distribution.MediumName; import org.apache.sis.internal.jaxb.cat.CodeListAdapter; import org.apache.sis.internal.jaxb.cat.CodeListUID; import org.apache.sis.internal.xml.LegacyNamespaces; diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java index 954d8e281e,86d7fac564..85af4a8e8c --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java @@@ -16,10 -16,9 +16,10 @@@ */ package org.apache.sis.internal.jaxb.code; - import javax.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlElement; import org.opengis.metadata.spatial.PixelOrientation; -import org.apache.sis.internal.jaxb.cat.EnumAdapter; +import org.apache.sis.internal.jaxb.cat.CodeListAdapter; +import org.apache.sis.internal.jaxb.cat.CodeListUID; import org.apache.sis.xml.Namespaces; @@@ -30,23 -29,20 +30,23 @@@ * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.0 + * @version 1.4 * @since 0.3 */ -public final class MD_PixelOrientationCode extends EnumAdapter<MD_PixelOrientationCode, PixelOrientation> { +public final class MD_PixelOrientationCode + extends CodeListAdapter<MD_PixelOrientationCode, PixelOrientation> +{ /** - * The enumeration value. + * Empty constructor for JAXB only. */ - @XmlElement(name = "MD_PixelOrientationCode", namespace = Namespaces.MSR) - private String value; + public MD_PixelOrientationCode() { + } /** - * Empty constructor for JAXB only. + * Creates a new adapter for the given proxy. */ - public MD_PixelOrientationCode() { + private MD_PixelOrientationCode(final CodeListUID value) { + super(value); } /** diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java index b997ae5da7,ce95d6e80e..bc9bc8a0f0 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java @@@ -16,10 -16,9 +16,10 @@@ */ package org.apache.sis.internal.jaxb.code; - import javax.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlElement; import org.opengis.metadata.identification.TopicCategory; -import org.apache.sis.internal.jaxb.cat.EnumAdapter; +import org.apache.sis.internal.jaxb.cat.CodeListAdapter; +import org.apache.sis.internal.jaxb.cat.CodeListUID; import org.apache.sis.xml.Namespaces; @@@ -31,21 -30,20 +31,21 @@@ * @author Cédric Briançon (Geomatys) * @author Guihem Legal (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.0 + * @version 1.4 * @since 0.3 */ -public final class MD_TopicCategoryCode extends EnumAdapter<MD_TopicCategoryCode, TopicCategory> { +public final class MD_TopicCategoryCode extends CodeListAdapter<MD_TopicCategoryCode, TopicCategory> { /** - * The enumeration value. + * Empty constructor for JAXB only. */ - @XmlElement(name = "MD_TopicCategoryCode", namespace = Namespaces.MRI) - private String value; + public MD_TopicCategoryCode() { + } /** - * Empty constructor for JAXB only. + * Creates a new adapter for the given proxy. */ - public MD_TopicCategoryCode() { + private MD_TopicCategoryCode(final CodeListUID value) { + super(value); } /** diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java index 6de1801729,b0938f1cba..697a68f633 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java @@@ -16,8 -16,8 +16,8 @@@ */ package org.apache.sis.internal.jaxb.code; - import javax.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlElement; -import org.opengis.metadata.content.PolarisationOrientation; +import org.opengis.metadata.content.PolarizationOrientation; import org.apache.sis.internal.jaxb.cat.CodeListAdapter; import org.apache.sis.internal.jaxb.cat.CodeListUID; import org.apache.sis.xml.Namespaces; diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java index c1715b0169,eb0b7e3f85..31a091cd35 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java @@@ -33,12 -33,16 +33,12 @@@ import org.apache.sis.internal.jaxb.Fil * JAXB adapter mapping implementing class to a legacy GeoAPI interface. * See package documentation for more information about JAXB and interface. * - * @deprecated This adapter is not used anymore for ISO 19115-3:2014 metadata. - * However, it is needed for branches that depend on GeoAPI 3.x, and is also needed - * for implementing web services that have not yet been upgraded to latest ISO standard. - * * @author Cédric Briançon (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.0 + * @version 1.4 * @since 0.3 */ -@Deprecated(since="1.0") +@SuppressWarnings("deprecation") public final class CI_ResponsibleParty extends PropertyType<CI_ResponsibleParty, ResponsibleParty> { /** * Empty constructor for JAXB only. diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java index abb3fb3104,e5d095e66c..9371171e70 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java @@@ -16,8 -16,7 +16,8 @@@ */ package org.apache.sis.internal.jaxb.metadata; +import java.net.URISyntaxException; - import javax.xml.bind.annotation.XmlElementRef; + import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.metadata.maintenance.Scope; import org.apache.sis.metadata.iso.maintenance.DefaultScope; import org.apache.sis.internal.jaxb.gco.PropertyType; diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java index 2d3586bc38,e7183f8326..5e6fe530bb --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/RS_Identifier.java @@@ -17,11 -17,9 +17,11 @@@ package org.apache.sis.internal.jaxb.metadata.replace; import org.apache.sis.metadata.iso.*; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlRootElement; import org.opengis.metadata.Identifier; +import org.opengis.metadata.citation.Citation; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.metadata.TitleProperty; import org.apache.sis.internal.xml.LegacyNamespaces; diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java index 9496fb0d4f,b8dc5df6c1..613f5c65e7 --- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java @@@ -16,12 -16,12 +16,12 @@@ */ package org.apache.sis.internal.jaxb.metadata.replace; - import javax.xml.bind.Marshaller; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.Marshaller; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.metadata.Identifier; import org.opengis.referencing.ReferenceSystem; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.simple.SimpleIdentifiedObject; import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.util.ComparisonMode; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java index c7e9d81766,1eaf2165ed..371b7fc7a3 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java @@@ -16,11 -16,10 +16,11 @@@ */ package org.apache.sis.metadata.iso; +import java.net.URI; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.metadata.ApplicationSchemaInformation; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.citation.OnlineResource; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java index 9ab6c06aa1,331dbfb17d..a45f37b990 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java @@@ -19,12 -19,12 +19,12 @@@ package org.apache.sis.metadata.iso import java.util.AbstractSet; import java.util.Collection; import java.util.Iterator; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.annotation.Obligation; import org.opengis.metadata.Datatype; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.Obligation; +import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.ExtendedElementInformation; import org.opengis.util.InternationalString; import org.apache.sis.metadata.TitleProperty; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/OnlineResourceAdapter.java index 9e7a20207b,0000000000..d531a6fd5d mode 100644,000000..100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/OnlineResourceAdapter.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/OnlineResourceAdapter.java @@@ -1,66 -1,0 +1,66 @@@ +/* + * 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.metadata.iso; + +import java.net.URI; +import java.net.URISyntaxException; - import javax.xml.bind.annotation.adapters.XmlAdapter; ++import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.opengis.metadata.citation.OnlineResource; +import org.apache.sis.internal.jaxb.metadata.CI_OnlineResource; +import org.apache.sis.metadata.iso.citation.DefaultOnlineResource; + + +/** + * Converts an URI to a {@code <cit:OnlineResource>} element for ISO 19115-3:2016 compliance. + * We need this additional adapter because some property type changed from {@code URI} to + * {@code OnlineResource} in the upgrade from ISO 19115:2003 to ISO 19115-1:2014. + * + * @author Martin Desruisseaux (Geomatys) + * @version 1.0 + * @since 1.0 + */ +final class OnlineResourceAdapter extends XmlAdapter<CI_OnlineResource, URI> { + /** + * The adapter performing the actual work. + */ + private static final CI_OnlineResource ADAPTER = new CI_OnlineResource.Since2014(); + + /** + * Wraps the given URI in a {@code <cit:OnlineResource>} element. + */ + @Override + public CI_OnlineResource marshal(final URI value) { + if (value != null) { + return ADAPTER.marshal(new DefaultOnlineResource(value)); + } + return null; + } + + /** + * Returns a URI from the given {@code <cit:OnlineResource>} element. + */ + @Override + public URI unmarshal(final CI_OnlineResource value) throws URISyntaxException { + if (value != null) { + final OnlineResource res = ADAPTER.unmarshal(value); + if (res != null) { + return res.getLinkage(); + } + } + return null; + } +} diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/URIStringAdapter.java index 07b42c5898,0000000000..b35da1dfd3 mode 100644,000000..100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/URIStringAdapter.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/URIStringAdapter.java @@@ -1,67 -1,0 +1,67 @@@ +/* + * 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.metadata.iso; + +import java.net.URI; +import java.net.URISyntaxException; - import javax.xml.bind.annotation.adapters.XmlAdapter; ++import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.apache.sis.internal.jaxb.Context; +import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter; +import org.apache.sis.internal.jaxb.gco.GO_CharacterString; + + +/** + * Converts an URI to a {@code <gco:CharacterSequence>} element for ISO 19115-3:2016 compliance. + * We need this additional adapter because some property type changed from {@code URI} + * to {@code CharacterSequence} in the upgrade from ISO 19115:2003 to ISO 19115-1:2014. + * + * @author Martin Desruisseaux (Geomatys) + * @version 1.0 + * @since 1.0 + */ +final class URIStringAdapter extends XmlAdapter<GO_CharacterString, URI> { + /** + * The adapter performing the actual work. + */ + private static final CharSequenceAdapter ADAPTER = new CharSequenceAdapter.Since2014(); + + /** + * Wraps the given URI in a {@code <cit:OnlineResource>} element. + */ + @Override + public GO_CharacterString marshal(final URI value) { + if (value != null) { + return ADAPTER.marshal(value.toString()); + } + return null; + } + + /** + * Returns a URI from the given {@code <cit:OnlineResource>} element. + */ + @Override + public URI unmarshal(final GO_CharacterString value) throws URISyntaxException { + if (value != null) { + final CharSequence uri = ADAPTER.unmarshal(value); + if (uri != null) { + final Context context = Context.current(); + return Context.converter(context).toURI(context, uri.toString()); + } + } + return null; + } +} diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java index a1fd5e7bc1,8f5fb88f28..674c23a1cc --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java @@@ -18,14 -18,14 +18,14 @@@ package org.apache.sis.metadata.iso.con import javax.measure.Unit; import javax.measure.quantity.Length; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; - import javax.xml.bind.annotation.XmlSeeAlso; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlSeeAlso; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.metadata.content.Band; import org.opengis.metadata.content.BandDefinition; -import org.opengis.metadata.content.PolarisationOrientation; +import org.opengis.metadata.content.PolarizationOrientation; import org.opengis.metadata.content.TransferFunctionType; import org.apache.sis.measure.ValueRange; import org.apache.sis.internal.jaxb.gco.GO_Real; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java index 6a52acf4ef,45b008708c..28a87a0d91 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java @@@ -18,11 -18,11 +18,11 @@@ package org.apache.sis.metadata.iso.dis import java.net.URI; import java.util.Collection; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.opengis.util.GenericName; +import org.opengis.util.LocalName; import org.opengis.metadata.distribution.Format; import org.opengis.metadata.distribution.DataFile; import org.apache.sis.xml.Namespaces; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java index d1f5e051f2,ccb519c812..5beea6e854 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java @@@ -17,10 -17,10 +17,10 @@@ package org.apache.sis.metadata.iso.distribution; import java.util.Collection; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.distribution.Format; import org.opengis.metadata.distribution.Distributor; import org.opengis.metadata.distribution.StandardOrderProcess; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java index 0a2b16d6fc,44a58d3a9f..ddb692c37f --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java @@@ -17,14 -17,14 +17,14 @@@ package org.apache.sis.metadata.iso.identification; import java.util.Collection; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlSeeAlso; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlSeeAlso; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.constraint.Constraints; import org.opengis.metadata.distribution.Format; import org.opengis.metadata.extent.Extent; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java index a149513469,7cad3771e6..2cbc6a2774 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java @@@ -21,13 -21,11 +21,13 @@@ import java.util.Collection import java.util.Collections; import java.util.Locale; import java.nio.charset.Charset; +import java.util.stream.Collectors; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; import org.opengis.util.InternationalString; import org.opengis.metadata.citation.Citation; +import org.opengis.metadata.identification.CharacterSet; import org.opengis.metadata.identification.TopicCategory; import org.opengis.metadata.identification.DataIdentification; import org.apache.sis.internal.jaxb.lan.LocaleAndCharset; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java index e5a5a42ad7,20dbdb3be5..9c5550eab5 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java @@@ -18,12 -18,12 +18,12 @@@ package org.apache.sis.metadata.iso.ide import java.util.Date; import java.util.Collection; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; import org.opengis.util.InternationalString; import org.opengis.metadata.citation.Citation; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.identification.Usage; import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.metadata.iso.ISOMetadata; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java index a2e71e5a57,0000000000..7619b889e5 mode 100644,000000..100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java @@@ -1,51 -1,0 +1,51 @@@ +/* + * 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.metadata.iso.maintenance; + - import javax.xml.bind.annotation.adapters.XmlAdapter; ++import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.opengis.feature.type.AttributeType; +import org.apache.sis.internal.jaxb.gco.GO_CharacterString; + + +/** + * For (un)marshalling deprecated {@link AttributeType} as a character string, + * as expected by ISO 19115-3:2016. This is a temporary bridge to be removed + * after the GeoAPI interfaces has been upgraded to ISO 19115-1:2014 model. + * + * @author Martin Desruisseaux (Geomatys) + * @version 1.0 + * @since 1.0 + */ +final class AttributeTypeAdapter extends XmlAdapter<GO_CharacterString, AttributeType> { + /** + * Wrap the given value from {@link DefaultScopeDescription} to the elements + * defined by ISO 19115-3:2016 schema. + */ + @Override + public AttributeType unmarshal(GO_CharacterString value) { + return new LegacyFeatureType(LegacyFeatureType.ADAPTER.unmarshal(value)); + } + + /** + * Unwrap the elements defined by ISO 19115-3:2016 schema to the value used by + * {@link DefaultScopeDescription}. + */ + @Override + public GO_CharacterString marshal(AttributeType value) { + return LegacyFeatureType.ADAPTER.marshal(LegacyFeatureType.wrap(value)); + } +} diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java index 2cd4ce9333,e01273399b..b57f9cfdc7 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java @@@ -20,12 -20,12 +20,12 @@@ import java.util.Date import java.util.Iterator; import java.util.Collection; import java.util.Collections; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; import org.opengis.metadata.citation.DateType; import org.opengis.metadata.citation.CitationDate; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.maintenance.MaintenanceFrequency; import org.opengis.metadata.maintenance.MaintenanceInformation; import org.opengis.metadata.maintenance.ScopeCode; diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java index ee1182e946,0000000000..c3ef65d804 mode 100644,000000..100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java @@@ -1,51 -1,0 +1,51 @@@ +/* + * 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.metadata.iso.maintenance; + - import javax.xml.bind.annotation.adapters.XmlAdapter; ++import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.opengis.feature.type.FeatureType; +import org.apache.sis.internal.jaxb.gco.GO_CharacterString; + + +/** + * For (un)marshalling deprecated {@link FeatureType} as a character string, + * as expected by ISO 19115-3:2016. This is a temporary bridge to be removed + * after the GeoAPI interfaces has been upgraded to ISO 19115-1:2014 model. + * + * @author Martin Desruisseaux (Geomatys) + * @version 1.0 + * @since 1.0 + */ +final class FeatureTypeAdapter extends XmlAdapter<GO_CharacterString, FeatureType> { + /** + * Wrap the given value from {@link DefaultScopeDescription} to the elements + * defined by ISO 19115-3:2016 schema. + */ + @Override + public FeatureType unmarshal(GO_CharacterString value) { + return new LegacyFeatureType(LegacyFeatureType.ADAPTER.unmarshal(value)); + } + + /** + * Unwrap the elements defined by ISO 19115-3:2016 schema to the value used by + * {@link DefaultScopeDescription}. + */ + @Override + public GO_CharacterString marshal(FeatureType value) { + return LegacyFeatureType.ADAPTER.marshal(LegacyFeatureType.wrap(value)); + } +} diff --cc core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java index ed7d36ccf7,266c2507c8..3ccf72981f --- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java @@@ -17,8 -17,9 +17,8 @@@ package org.apache.sis.internal.jaxb.cat; import java.util.List; -import java.util.EnumSet; import java.util.Collection; - import javax.xml.bind.JAXBException; + import jakarta.xml.bind.JAXBException; import org.opengis.metadata.identification.TopicCategory; import org.apache.sis.metadata.iso.identification.DefaultDataIdentification; import org.apache.sis.xml.Namespaces; diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java index ae2b8d0e6d,0eaf8b8361..d9363d89cd --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java @@@ -16,8 -16,8 +16,8 @@@ */ package org.apache.sis.metadata.iso.content; - import javax.xml.bind.JAXBException; + import jakarta.xml.bind.JAXBException; -import org.opengis.metadata.content.PolarisationOrientation; +import org.opengis.metadata.content.PolarizationOrientation; import org.apache.sis.util.Version; import org.apache.sis.test.xml.TestCase; import org.junit.Test; diff --cc core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java index c73efff4e7,646cc25111..f8e2d07538 --- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java @@@ -19,12 -19,12 +19,12 @@@ package org.apache.sis.test.mock import java.util.Arrays; import java.util.Collection; import java.io.Serializable; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.util.GenericName; -import org.opengis.metadata.Identifier; import org.opengis.referencing.IdentifiedObject; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.util.Strings; import org.apache.sis.internal.util.CollectionsExt; import org.apache.sis.internal.jaxb.gco.GO_GenericName; diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java index f8f77b3ede,f626fdd1bb..f986256bd1 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java @@@ -23,10 -23,9 +23,10 @@@ import java.util.HashMap import java.util.HashSet; import java.util.Collection; import java.util.LinkedHashMap; - import javax.xml.bind.annotation.XmlElementRef; + import jakarta.xml.bind.annotation.XmlElementRef; import org.opengis.util.GenericName; import org.opengis.metadata.Identifier; +import org.opengis.referencing.ReferenceIdentifier; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterDescriptorGroup; import org.opengis.parameter.GeneralParameterDescriptor; diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java index b787f6f562,95f7e29f9f..dc28115bcb --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java @@@ -16,12 -16,11 +16,12 @@@ */ package org.apache.sis.internal.jaxb.referencing; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlValue; - import javax.xml.bind.annotation.XmlAttribute; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlValue; + import jakarta.xml.bind.annotation.XmlAttribute; import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.util.Constants; import org.apache.sis.internal.util.DefinitionURI; import org.apache.sis.internal.metadata.NameMeaning; diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java index 3f9f599a80,2f6c3ba9fd..31b9fcbdc6 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java @@@ -20,8 -20,9 +20,8 @@@ import java.util.Map import java.util.HashMap; import java.util.Collection; import java.util.logging.Logger; - import javax.xml.bind.annotation.XmlTransient; + import jakarta.xml.bind.annotation.XmlTransient; import org.opengis.util.GenericName; -import org.opengis.metadata.Identifier; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterDescriptorGroup; import org.opengis.referencing.IdentifiedObject; diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java index b346aadd96,d9597529c2..7a3ecf05b7 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java @@@ -19,11 -19,10 +19,11 @@@ package org.apache.sis.referencing.oper import java.util.Map; import java.util.Arrays; import java.util.Objects; - import javax.xml.bind.Unmarshaller; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.Unmarshaller; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.XmlRootElement; +import org.opengis.parameter.ParameterValueGroup; import org.opengis.util.FactoryException; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.Conversion; diff --cc ide-project/NetBeans/nbproject/project.properties index 60ffb9f667,697f05121b..620682ada9 --- a/ide-project/NetBeans/nbproject/project.properties +++ b/ide-project/NetBeans/nbproject/project.properties @@@ -91,12 -91,12 +91,12 @@@ test.jpn-profile.dir = ${project.root}/ # Those dependencies must exist in the local Maven repository. # Those numbers should match the ones declared in the pom.xml files. # -geoapi.version = 4.0-SNAPSHOT +geoapi.version = 3.1-SNAPSHOT jsr385.version = 2.1.3 - jaxb.version = 2.3.3 - jaxb.runtime = 2.3.7 + jaxb.version = 4.0.0 + jaxb.runtime = 4.0.2 istack.version = 3.0.12 - activation.version = 1.2.2 + activation.version = 2.1.0 jama.version = 1.0.3 geographlib.version = 2.0 guava.version = 30.1-jre diff --cc profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java index f30e7808b3,a5e14f9096..270d90d4b5 --- a/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java +++ b/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java @@@ -16,10 -16,10 +16,10 @@@ */ package org.apache.sis.internal.profile.fra; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.metadata.Identifier; import org.opengis.referencing.ReferenceSystem; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata; import org.apache.sis.util.ComparisonMode; diff --cc profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java index 9e77e7dda3,c234ece285..45049f8f8e --- a/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java +++ b/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java @@@ -16,10 -16,10 +16,10 @@@ */ package org.apache.sis.internal.profile.fra; - import javax.xml.bind.annotation.XmlType; - import javax.xml.bind.annotation.XmlRootElement; + import jakarta.xml.bind.annotation.XmlType; + import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.metadata.Identifier; import org.opengis.referencing.ReferenceSystem; +import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata; import org.apache.sis.util.ComparisonMode; diff --cc profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java index 50c2292492,7d16db227c..57144cc358 --- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java +++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java @@@ -18,9 -18,10 +18,9 @@@ package org.apache.sis.internal.profile import java.util.Set; import java.util.Collection; - import javax.xml.bind.JAXBException; + import jakarta.xml.bind.JAXBException; -import org.opengis.metadata.citation.Responsibility; +import org.opengis.metadata.citation.ResponsibleParty; import org.apache.sis.metadata.iso.DefaultMetadata; -import org.apache.sis.metadata.iso.DefaultIdentifier; import org.apache.sis.metadata.iso.citation.DefaultCitation; import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty; import org.apache.sis.metadata.iso.citation.HardCodedCitations; diff --cc storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java index 9c8e246e4b,de483bfbf7..fb5a008167 --- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java +++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java @@@ -16,14 -16,12 +16,14 @@@ */ package org.apache.sis.internal.storage.gpx; +import java.util.AbstractSet; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; import java.util.Locale; import java.util.Objects; - import javax.xml.bind.annotation.XmlElement; - import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import jakarta.xml.bind.annotation.XmlElement; + import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.opengis.metadata.citation.Address; import org.opengis.metadata.citation.Contact; import org.opengis.metadata.citation.OnlineResource; @@@ -59,10 -55,10 +59,10 @@@ import org.opengis.metadata.citation.Re * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 0.8 + * @version 1.4 * @since 0.8 */ -public final class Person implements Responsibility, Party, Contact, Address { +public final class Person implements ResponsibleParty, Party, Contact, Address { /** * Name of person or organization. *
