Author: desruisseaux Date: Thu Feb 8 13:57:12 2018 New Revision: 1823556 URL: http://svn.apache.org/viewvc?rev=1823556&view=rev Log: Fix property order in tests and remove some private methods for JAXB defined only for element ordering. Change in element order will be managed by FilteredWriter instead. This commit fixes some sis-metadata tests, but not all.
Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -43,7 +43,7 @@ import org.opengis.annotation.Obligation * </ol> * * @author Martin Desruisseaux (Geomatys) - * @version 0.8 + * @version 1.0 * @since 0.3 * @module */ @@ -129,10 +129,7 @@ final class PropertyComparator implement * If duplicated properties are found, keep the first occurence (i.e. sort the property * with the most specialized child that declared it). */ - final Integer old = order.put(propOrder[i], order.size()); - if (old != null) { - order.put(propOrder[i], old); - } + order.putIfAbsent(propOrder[i], order.size()); } } implementation = implementation.getSuperclass(); Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -91,8 +91,8 @@ import static org.apache.sis.internal.me "collectiveTitle", "ISBN", "ISSN", - "onlineResource", - "graphic" + "onlineResource", // New in ISO 19115:2014 + "graphic" // Ibid. }) @XmlRootElement(name = "CI_Citation") public class DefaultCitation extends ISOMetadata implements Citation { Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -63,10 +63,10 @@ import org.apache.sis.util.iso.Types; @XmlType(name = "MD_Constraints_Type", propOrder = { "useLimitations", "constraintApplicationScope", - "graphic", - "reference", - "releasability", - "responsibleParty" + "graphic", // New in ISO 19115:2014 + "reference", // Ibid. + "releasability", // Ibid. + "responsibleParty" // Ibid. }) @XmlRootElement(name = "MD_Constraints") @XmlSeeAlso({ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -62,7 +62,7 @@ import org.apache.sis.internal.jaxb.gco. "sequenceIdentifier", "description", // New in ISO 19115:2014 "descriptor", // Legacy ISO 19115:2003 - "name" + "name" // New in ISO 19115:2014 }) @XmlRootElement(name = "MD_RangeDimension") @XmlSeeAlso(DefaultBand.class) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -17,6 +17,7 @@ package org.apache.sis.metadata.iso.distribution; import java.util.Collection; +import java.util.function.BiConsumer; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -35,9 +36,6 @@ import org.apache.sis.internal.jaxb.meta import org.apache.sis.metadata.iso.citation.DefaultCitation; import org.apache.sis.metadata.iso.ISOMetadata; -// Branch-dependent imports -import java.util.function.BiConsumer; - /** * Description of the computer language construct that specifies the representation Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -62,8 +62,8 @@ import org.apache.sis.xml.Namespaces; "fileName", "fileDescription", "fileType", - "linkage", - "imageConstraint" + "linkage", // New in ISO 19115:2014 + "imageConstraint" // Ibid. }) @XmlRootElement(name = "MD_BrowseGraphic", namespace = Namespaces.MCC) public class DefaultBrowseGraphic extends ISOMetadata implements BrowseGraphic { Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -26,8 +26,6 @@ import org.opengis.parameter.ParameterDe import org.opengis.metadata.citation.OnlineResource; import org.opengis.metadata.identification.DistributedComputingPlatform; import org.opengis.metadata.identification.OperationMetadata; -import org.apache.sis.internal.jaxb.FilterByVersion; -import org.apache.sis.internal.jaxb.LegacyNamespaces; import org.apache.sis.metadata.iso.ISOMetadata; import org.apache.sis.metadata.TitleProperty; import org.apache.sis.xml.Namespaces; @@ -63,13 +61,11 @@ import org.apache.sis.xml.Namespaces; @TitleProperty(name = "operationName") @XmlType(name = "SV_OperationMetadata_Type", namespace = Namespaces.SRV, propOrder = { "operationName", - "distributedComputingPlatform", // Name used in ISO 19115:2014. - "DCP", // Former name of "distributedComputingPlatform" used in ISO 19115:2003. + "distributedComputingPlatforms", // Singular form used in ISO 19115:2014, was "DCP" in ISO 19115:2003. "operationDescription", "invocationName", - "parameterList", // Actually "parameters" — was the spelling in ISO 19115:2003. "connectPoints", // Was after "parameters" in ISO 19115:2003. - "parameter", // New spelling in ISO 19115-3:2016. + "parameters", // Actually "parameter" in ISO 19115:2014, was "parameters" in ISO 19115:2003. "dependsOn" }) @XmlRootElement(name = "SV_OperationMetadata", namespace = Namespaces.SRV) @@ -211,7 +207,7 @@ public class DefaultOperationMetadata ex * @return distributed computing platforms on which the operation has been implemented. */ @Override - // @XmlElement at the end of this class. + @XmlElement(name = "distributedComputingPlatform", required = true) public Collection<DistributedComputingPlatform> getDistributedComputingPlatforms() { return distributedComputingPlatforms = nonNullCollection(distributedComputingPlatforms, DistributedComputingPlatform.class); } @@ -294,8 +290,8 @@ public class DefaultOperationMetadata ex * @return the parameters that are required for this interface, or an empty collection if none. */ @Override + @XmlElement(name = "parameter") @SuppressWarnings({"unchecked", "rawtypes"}) - // @XmlElement at the end of this class. public Collection<ParameterDescriptor<?>> getParameters() { return parameters = nonNullCollection(parameters, (Class) ParameterDescriptor.class); } @@ -329,56 +325,4 @@ public class DefaultOperationMetadata ex public void setDependsOn(final List<? extends OperationMetadata> newValues) { dependsOn = writeList(newValues, dependsOn, OperationMetadata.class); } - - - - - ////////////////////////////////////////////////////////////////////////////////////////////////// - //////// //////// - //////// XML support with JAXB //////// - //////// //////// - //////// The following methods are invoked by JAXB using reflection (even if //////// - //////// they are private) or are helpers for other methods invoked by JAXB. //////// - //////// Those methods can be safely removed if Geographic Markup Language //////// - //////// (GML) support is not needed. //////// - //////// //////// - ////////////////////////////////////////////////////////////////////////////////////////////////// - - /** - * Invoked by JAXB at both marshalling and unmarshalling time. - * This attribute has been added by ISO 19115:2014 standard. - * If (and only if) marshalling an older standard version, we omit this attribute. - */ - @XmlElement(name = "distributedComputingPlatform", required = true) - private Collection<DistributedComputingPlatform> getDistributedComputingPlatform() { - return FilterByVersion.CURRENT_METADATA.accept() ? getDistributedComputingPlatforms() : null; - } - - /** - * Invoked by JAXB at both marshalling and unmarshalling time. - * This attribute was defined by ISO 19115:2003 standard. - * If (and only if) marshalling a more recent standard version, we omit this attribute. - */ - @XmlElement(name = "DCP", namespace = LegacyNamespaces.SRV) - private Collection<DistributedComputingPlatform> getDCP() { - return FilterByVersion.LEGACY_METADATA.accept() ? getDistributedComputingPlatforms() : null; - } - - /** - * Invoked by JAXB for (un)marshalling using ISO 19115-3:2016 spelling. - * Note that 19115-1:2014 still use the "parameters" spelling - * (we seem to have an 19115-1 / ISO 19115-3 discrepancy here). - */ - @XmlElement(name = "parameter") - private Collection<ParameterDescriptor<?>> getParameter() { - return FilterByVersion.CURRENT_METADATA.accept() ? getParameters() : null; - } - - /** - * Invoked by JAXB for (un)marshalling using legacy ISO 19115:2003 spelling. - */ - @XmlElement(name = "parameters", namespace = LegacyNamespaces.SRV) - private Collection<ParameterDescriptor<?>> getParameterList() { - return FilterByVersion.LEGACY_METADATA.accept() ? getParameters() : null; - } } Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -72,8 +72,8 @@ import static org.apache.sis.internal.me "userDeterminedLimitations", "userContactInfo", "response", // New in ISO 19115:2014 - "additionalDocumentations", // New in ISO 19115:2014 - "issues" // New in ISO 19115:2014. Actually "identifiedIssues" + "additionalDocumentations", // Ibid. + "issues" // Ibid. Actually "identifiedIssues" }) @XmlRootElement(name = "MD_Usage") public class DefaultUsage extends ISOMetadata implements Usage { Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -45,7 +45,6 @@ import org.apache.sis.internal.jaxb.Filt import org.apache.sis.internal.jaxb.LegacyNamespaces; import org.apache.sis.internal.metadata.Dependencies; import org.apache.sis.util.iso.Types; -import org.apache.sis.xml.Namespaces; /** @@ -487,7 +486,7 @@ public class DefaultSource extends ISOMe * @return processing level of the source data, or {@code null}. */ @Override - @XmlElement(name = "processedLevel", namespace = Namespaces.GMI) + @XmlElement(name = "processedLevel") public Identifier getProcessedLevel() { return processedLevel; } @@ -508,7 +507,7 @@ public class DefaultSource extends ISOMe * @return distance between consistent parts of two adjacent pixels, or {@code null}. */ @Override - @XmlElement(name = "resolution", namespace = Namespaces.GMI) + @XmlElement(name = "resolution") public NominalResolution getResolution() { return resolution; } Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -75,8 +75,7 @@ xmlns = { @XmlNs(prefix = "mrl", namespaceURI = Namespaces.MRL), // Metadata for Resource Lineage @XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC), // Metadata Common Classes - @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD), - @XmlNs(prefix = "gmi", namespaceURI = LegacyNamespaces.GMI) + @XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD) }) @XmlAccessorType(XmlAccessType.NONE) @XmlJavaTypeAdapters({ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -35,7 +35,7 @@ import static org.apache.sis.metadata.Ke * Unless otherwise specified, all tests use the {@link MetadataStandard#ISO_19115} constant. * * @author Martin Desruisseaux (Geomatys) - * @version 0.5 + * @version 1.0 * @since 0.3 * @module */ @@ -65,8 +65,8 @@ public final strictfp class NameMapTest // new SimpleEntry<>("collectiveTitle", "collectiveTitle"), -- deprecated as of ISO 19115:2014 new SimpleEntry<>("ISBN", "ISBN"), new SimpleEntry<>("ISSN", "ISSN"), - new SimpleEntry<>("graphic", "graphics"), - new SimpleEntry<>("onlineResource", "onlineResources") + new SimpleEntry<>("onlineResource", "onlineResources"), + new SimpleEntry<>("graphic", "graphics") }, map.entrySet().toArray()); assertEquals("alternateTitles", map.get("alternateTitle")); Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -38,7 +38,7 @@ import org.opengis.metadata.constraint.C import org.opengis.metadata.content.AttributeGroup; import org.opengis.metadata.content.CoverageContentType; import org.opengis.metadata.content.CoverageDescription; -import org.opengis.metadata.identification.*; // Really using almost everything. +import org.opengis.metadata.identification.*; // Really using almost everything. import org.opengis.metadata.maintenance.MaintenanceInformation; import org.opengis.metadata.spatial.SpatialRepresentationType; import org.opengis.referencing.IdentifiedObject; Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -188,8 +188,8 @@ public final strictfp class TreeNodeTest private void assertCitationContentEquals(final int offset, final TableColumn<?> column, final Object... expected) { if (valuePolicy == ValueExistencePolicy.COMPACT) { assertEquals(19, expected.length); - System.arraycopy(expected, 11+offset, expected, 10+offset, 8-offset); // Compact the "Individual" element. - System.arraycopy(expected, 7+offset, expected, 6+offset, 11-offset); // Compact the "Organisation" element. + System.arraycopy(expected, 12+offset, expected, 11+offset, 7-offset); // Compact the "Individual" element. + System.arraycopy(expected, 8+offset, expected, 7+offset, 10-offset); // Compact the "Organisation" element. System.arraycopy(expected, 1+offset, expected, offset, 16-offset); // Compact the "Title" element. Arrays.fill(expected, 16, 19, null); } @@ -209,16 +209,16 @@ public final strictfp class TreeNodeTest "Alternate title (2 of 2)", "Edition", "Cited responsible party (1 of 2)", + "Role", "Organisation", // A Party subtype "Name", // In COMPACT mode, this value is associated to "Organisation" node. - "Role", "Cited responsible party (2 of 2)", + "Role", "Individual", // A Party subtype "Name", // In COMPACT mode, this value is associated to "Individual" node. "Contact info", "Address", "Electronic mail address", - "Role", "Presentation form (1 of 2)", "Presentation form (2 of 2)", "Other citation details"); @@ -240,16 +240,16 @@ public final strictfp class TreeNodeTest "alternateTitle", "edition", "citedResponsibleParty", + "role", "party", "name", // In COMPACT mode, this value is associated to "party" node. - "role", "citedResponsibleParty", + "role", "party", "name", // In COMPACT mode, this value is associated to "party" node. "contactInfo", "address", "electronicMailAddress", - "role", "presentationForm", "presentationForm", "otherCitationDetails"); @@ -270,16 +270,16 @@ public final strictfp class TreeNodeTest ONE, // alternateTitle null, // edition ZERO, // citedResponsibleParty + null, // role ZERO, // party (organisation) null, // name — in COMPACT mode, this value is associated to "party" node. - null, // role ONE, // citedResponsibleParty + null, // role ZERO, // party (individual) null, // name — in COMPACT mode, this value is associated to "party" node. ZERO, // contactInfo ZERO, // address ZERO, // electronicMailAddress - null, // role ZERO, // presentationForm ONE, // presentationForm ZERO); // otherCitationDetails @@ -298,16 +298,16 @@ public final strictfp class TreeNodeTest InternationalString.class, InternationalString.class, Responsibility.class, + Role.class, Party.class, // In COMPACT mode, value with be the one of "name" node instead. InternationalString.class, // Name - Role.class, Responsibility.class, + Role.class, Party.class, // In COMPACT mode, value with be the one of "name" node instead. InternationalString.class, // Name Contact.class, Address.class, String.class, - Role.class, PresentationForm.class, PresentationForm.class, InternationalString.class); @@ -326,16 +326,16 @@ public final strictfp class TreeNodeTest "Second alternate title", "Some edition", null, // ResponsibleParty + Role.DISTRIBUTOR, null, // Party (organisation) "Some organisation", - Role.DISTRIBUTOR, null, // ResponsibleParty + Role.POINT_OF_CONTACT, null, // Party (individual) "Some person of contact", null, // Contact null, // Address "Some email", - Role.POINT_OF_CONTACT, PresentationForm.MAP_DIGITAL, PresentationForm.MAP_HARDCOPY, "Some other details"); Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -44,7 +44,7 @@ import static org.apache.sis.test.Assert * Tests the {@link TreeTableFormat} applied to the formatting of metadata tree. * * @author Martin Desruisseaux (Geomatys) - * @version 0.8 + * @version 1.0 * @since 0.3 * @module */ @@ -91,18 +91,18 @@ public final strictfp class TreeTableFor " │ │ └─Alternate title…………………………… ISBN\n" + " │ └─Code space…………………………………………………… ISBN\n"+ " ├─Cited responsible party (1 of 2)\n" + - " │ ├─Individual…………………………………………………… Testsuya Toyoda\n" + - " │ └─Role…………………………………………………………………… Author\n" + + " │ ├─Role…………………………………………………………………… Author\n" + + " │ └─Individual…………………………………………………… Testsuya Toyoda\n" + " ├─Cited responsible party (2 of 2)\n" + - " │ ├─Organisation……………………………………………… Kōdansha\n" + " │ ├─Role…………………………………………………………………… Editor\n" + - " │ └─Extent……………………………………………………………… World\n" + - " │ └─Geographic element\n" + - " │ ├─West bound longitude…… 180°W\n" + - " │ ├─East bound longitude…… 180°E\n" + - " │ ├─South bound latitude…… 90°S\n" + - " │ ├─North bound latitude…… 90°N\n" + - " │ └─Extent type code……………… true\n" + + " │ ├─Extent……………………………………………………………… World\n" + + " │ │ └─Geographic element\n" + + " │ │ ├─West bound longitude…… 180°W\n" + + " │ │ ├─East bound longitude…… 180°E\n" + + " │ │ ├─South bound latitude…… 90°S\n" + + " │ │ ├─North bound latitude…… 90°N\n" + + " │ │ └─Extent type code……………… true\n" + + " │ └─Organisation……………………………………………… Kōdansha\n" + " ├─Presentation form (1 of 2)…………………… Document digital\n" + " ├─Presentation form (2 of 2)…………………… Document hardcopy\n" + " └─ISBN……………………………………………………………………………… 9782505004509\n", text); Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -36,7 +36,7 @@ import static org.apache.sis.test.TestUt * Unless otherwise specified, all tests use the {@link MetadataStandard#ISO_19115} constant. * * @author Martin Desruisseaux (Geomatys) - * @version 0.8 + * @version 1.0 * @since 0.3 * @module */ @@ -59,14 +59,14 @@ public final strictfp class TreeTableVie " ├─Alternate title (2 of 2)…………………………………………… Second alternate title\n" + " ├─Edition………………………………………………………………………………………… Some edition\n" + " ├─Cited responsible party (1 of 2)\n" + - " │ ├─Organisation………………………………………………………………… Some organisation\n" + - " │ └─Role……………………………………………………………………………………… Distributor\n" + + " │ ├─Role……………………………………………………………………………………… Distributor\n" + + " │ └─Organisation………………………………………………………………… Some organisation\n" + " ├─Cited responsible party (2 of 2)\n" + - " │ ├─Individual……………………………………………………………………… Some person of contact\n" + - " │ │ └─Contact info\n" + - " │ │ └─Address\n" + - " │ │ └─Electronic mail address…… Some email\n" + - " │ └─Role……………………………………………………………………………………… Point of contact\n" + + " │ ├─Role……………………………………………………………………………………… Point of contact\n" + + " │ └─Individual……………………………………………………………………… Some person of contact\n" + + " │ └─Contact info\n" + + " │ └─Address\n" + + " │ └─Electronic mail address…… Some email\n" + " ├─Presentation form (1 of 2)……………………………………… Map digital\n" + " ├─Presentation form (2 of 2)……………………………………… Map hardcopy\n" + " └─Other citation details………………………………………………… Some other details\n"; Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -47,7 +47,7 @@ import static java.util.AbstractMap.Simp * Unless otherwise specified, all tests use the {@link MetadataStandard#ISO_19115} constant. * * @author Martin Desruisseaux (Geomatys) - * @version 0.5 + * @version 1.0 * @since 0.3 * @module */ @@ -77,8 +77,8 @@ public final strictfp class TypeMapTest // new SimpleEntry<>("collectiveTitle", InternationalString.class), -- deprecated as of ISO 19115:2014 new SimpleEntry<>("ISBN", String.class), new SimpleEntry<>("ISSN", String.class), - new SimpleEntry<>("graphic", BrowseGraphic.class), - new SimpleEntry<>("onlineResource", OnlineResource.class) + new SimpleEntry<>("onlineResource", OnlineResource.class), + new SimpleEntry<>("graphic", BrowseGraphic.class) }, map.entrySet().toArray()); assertEquals(InternationalString.class, map.get("alternateTitle")); Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -46,7 +46,7 @@ import static org.apache.sis.test.TestUt * Unless otherwise specified, all tests use the {@link MetadataStandard#ISO_19115} constant. * * @author Martin Desruisseaux (Geomatys) - * @version 0.5 + * @version 1.0 * * @see MetadataStandardTest#testValueMap() * @@ -174,8 +174,8 @@ public final strictfp class ValueMapTest new SimpleEntry<>("presentationForms", emptySet()), new SimpleEntry<>("otherCitationDetails", emptyList()), new SimpleEntry<>("ISBN", "9782505004509"), - new SimpleEntry<>("graphics", emptyList()), - new SimpleEntry<>("onlineResources", emptyList()) + new SimpleEntry<>("onlineResources", emptyList()), + new SimpleEntry<>("graphics", emptyList()) }, all.entrySet().toArray()); } @@ -205,8 +205,8 @@ public final strictfp class ValueMapTest new SimpleEntry<>("presentationForms", emptySet()), new SimpleEntry<>("otherCitationDetails", emptyList()), new SimpleEntry<>("ISBN", "9782505004509"), - new SimpleEntry<>("graphics", emptyList()), - new SimpleEntry<>("onlineResources", emptyList()) + new SimpleEntry<>("onlineResources", emptyList()), + new SimpleEntry<>("graphics", emptyList()) }, all.entrySet().toArray()); } @@ -238,8 +238,8 @@ public final strictfp class ValueMapTest // new SimpleEntry<>("collectiveTitle", null), -- deprecated as of ISO 19115:2014. new SimpleEntry<>("ISBN", "9782505004509"), new SimpleEntry<>("ISSN", null), - new SimpleEntry<>("graphics", emptyList()), - new SimpleEntry<>("onlineResources", emptyList()) + new SimpleEntry<>("onlineResources", emptyList()), + new SimpleEntry<>("graphics", emptyList()) }, all.entrySet().toArray()); } Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -94,6 +94,7 @@ import org.junit.BeforeClass; org.apache.sis.metadata.iso.DefaultMetadataTest.class, org.apache.sis.metadata.iso.CustomMetadataTest.class, org.apache.sis.metadata.iso.AllMetadataTest.class, + org.apache.sis.metadata.iso.MarshallingTest.class, org.apache.sis.metadata.iso.APIVerifier.class, org.apache.sis.io.wkt.ConventionTest.class, Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java?rev=1823556&r1=1823555&r2=1823556&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/SchemaCompliance.java [UTF-8] Thu Feb 8 13:57:12 2018 @@ -84,6 +84,7 @@ public final strictfp class SchemaCompli m.put("MI_CoverageDescription_Type", "MD_CoverageDescription_Type"); m.put("MI_Georectified_Type", "MD_Georectified_Type"); m.put("MI_Georeferenceable_Type", "MD_Georeferenceable_Type"); + m.put("LE_Source_Type", "LI_Source_Type"); m.put("LE_ProcessStep_Type", "LI_ProcessStep_Type"); m.put("AbstractMX_File_Type", "MX_DataFile_Type"); m.put("Abstract_DataQuality_Type", "DQ_DataQuality_Type");