This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git.
from 8164ff4 Merge branch 'geoapi-4.0' into geoapi-3.1, but replacing method renaming by a comment about future evolution. add 6640cc3 Update for GeoAPI change: Medium.name property type changed from MediumName to Citation. https://issues.apache.org/jira/browse/SIS-389 new dc69af0 Merge branch 'geoapi-4.0' into geoapi-3.1 but without changing the Medium.name property type for compatibility reason. add f15686f In Metadata, java.nio.charset.Charset should be associated to java.util.Locale. This issue is described at https://github.com/opengeospatial/geoapi/issues/28 and is required for https://issues.apache.org/jira/browse/SIS-402 resolution. This work required improvement in many SIS internal classes (ModifiableMetadata, PropertyAccessor, Merger, TreeFormat, PT_Locale, etc…) for allowing the use of java.util.Map in addition of java.util.Collection in metadata properties. add f8f18f1 Fix the unmarshalling of <gmd:characterSet> attribute from legacy XML documents. https://issues.apache.org/jira/browse/SIS-402 add 50b074f Remove LegacyPropertyAdapter.asCollection(…) method since it duplicates CollectionsExt.singletonOrEmpty(…). new 0018ef8 Merge branch 'geoapi-4.0' into geoapi-3.1. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/internal/jaxb/cat/CodeListUID.java | 3 +- .../internal/jaxb/code/MD_CharacterSetLegacy.java | 84 ----- .../sis/internal/jaxb/code/MD_MediumNameCode.java | 2 +- .../sis/internal/jaxb/lan/LocaleAdapter.java | 62 ++++ .../sis/internal/jaxb/lan/LocaleAndCharset.java | 400 +++++++++++++++++++++ .../apache/sis/internal/jaxb/lan/OtherLocales.java | 150 ++++++++ .../apache/sis/internal/jaxb/lan/PT_Locale.java | 216 ++++++++--- .../internal/metadata/LegacyPropertyAdapter.java | 37 +- .../org/apache/sis/internal/metadata/Merger.java | 83 ++++- .../sis/internal/metadata/MetadataUtilities.java | 42 +++ .../apache/sis/internal/metadata/OtherLocales.java | 189 ---------- .../internal/metadata/legacy}/package-info.java | 9 +- .../apache/sis/internal/simple/SimpleMetadata.java | 21 +- .../apache/sis/metadata/ModifiableMetadata.java | 170 +++++++-- .../org/apache/sis/metadata/PropertyAccessor.java | 48 ++- .../java/org/apache/sis/metadata/SpecialCases.java | 30 +- .../java/org/apache/sis/metadata/TreeNode.java | 61 +++- .../org/apache/sis/metadata/TreeNodeChildren.java | 51 +-- .../iso/DefaultExtendedElementInformation.java | 7 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 265 ++++++++------ .../sis/metadata/iso/citation/DefaultContact.java | 7 +- .../iso/content/DefaultCoverageDescription.java | 9 +- .../DefaultFeatureCatalogueDescription.java | 76 ++-- .../sis/metadata/iso/content/package-info.java | 4 +- .../DefaultDigitalTransferOptions.java | 2 +- .../metadata/iso/distribution/DefaultFormat.java | 3 +- .../metadata/iso/distribution/DefaultMedium.java | 59 ++- .../identification/DefaultDataIdentification.java | 126 ++++--- .../metadata/iso/identification/package-info.java | 7 +- .../maintenance/DefaultMaintenanceInformation.java | 5 +- .../org/apache/sis/metadata/iso/package-info.java | 8 +- .../sis/metadata/iso/quality/DefaultScope.java | 3 +- .../main/java/org/apache/sis/util/iso/Types.java | 6 +- .../java/org/apache/sis/xml/ValueConverter.java | 2 +- .../org/apache/sis/xml/RenameOnExport.lst | 2 +- .../org/apache/sis/xml/RenameOnImport.lst | 2 +- .../sis/internal/jaxb/lan/LanguageCodeTest.java | 6 +- .../sis/internal/jaxb/lan/OtherLocalesTest.java | 112 ++++++ .../sis/internal/jaxb/lan/PT_LocaleTest.java | 12 +- .../apache/sis/internal/metadata/MergerTest.java | 13 +- .../internal/metadata/MetadataUtilitiesTest.java | 32 +- .../sis/internal/metadata/OtherLocalesTest.java | 129 ------- .../apache/sis/metadata/PropertyAccessorTest.java | 8 +- .../sis/metadata/PropertyConsistencyCheck.java | 23 +- .../sis/metadata/iso/CustomMetadataTest.java | 2 + .../sis/metadata/iso/DefaultMetadataTest.java | 20 +- .../DefaultDataIdentificationTest.java | 44 ++- .../org/apache/sis/test/mock/MetadataMock.java | 15 +- .../apache/sis/test/suite/MetadataTestSuite.java | 2 +- .../sis/test/xml/AnnotationConsistencyCheck.java | 17 +- .../apache/sis/test/integration/MetadataTest.java | 18 +- .../apache/sis/internal/util/CollectionsExt.java | 21 ++ .../sis/internal/util/TreeFormatCustomization.java | 8 + .../sis/util/collection/TreeTableFormat.java | 32 +- .../earthobservation/LandsatReaderTest.java | 2 +- .../apache/sis/internal/storage/xml/StoreTest.java | 6 +- 56 files changed, 1886 insertions(+), 887 deletions(-) delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/OtherLocales.java delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java copy {storage/sis-xmlstore/src/main/java/org/apache/sis/storage/gps => core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/legacy}/package-info.java (87%) create mode 100644 core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/OtherLocalesTest.java