This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new e2a4f94058 Anticipate some of class name changes expected with upgrade
to ISO 19157:2022. Not all impacted types are renamed, only the ones that are
new in SIS 1.3 release. Other impacted classes and methods will be renamed
later.
e2a4f94058 is described below
commit e2a4f940588b9f962e21c974e0a932679e5de482
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Fri Dec 2 18:51:20 2022 +0100
Anticipate some of class name changes expected with upgrade to ISO
19157:2022.
Not all impacted types are renamed, only the ones that are new in SIS 1.3
release.
Other impacted classes and methods will be renamed later.
https://github.com/opengeospatial/geoapi/issues/80
---
.../internal/jaxb/metadata/DQM_Description.java | 8 +-
.../sis/internal/jaxb/metadata/DQM_Measure.java | 8 +-
.../DQ_StandaloneQualityReportInformation.java | 8 +-
.../jaxb/metadata/replace/QualityParameter.java | 4 +-
.../sis/metadata/iso/quality/AbstractElement.java | 12 +--
...ava => DefaultEvaluationReportInformation.java} | 18 ++--
...ription.java => DefaultMeasureDescription.java} | 22 ++---
...aultMeasure.java => DefaultQualityMeasure.java} | 20 ++--
.../sis/metadata/iso/quality/DefaultUsability.java | 4 +-
.../iso/quality/DefaultUsabilityElement.java | 106 ---------------------
.../metadata/replace/QualityParameterTest.java | 4 +-
.../apache/sis/metadata/iso/AllMetadataTest.java | 7 +-
12 files changed, 57 insertions(+), 164 deletions(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Description.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Description.java
index 30e555685f..2334675a62 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Description.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Description.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.metadata;
import javax.xml.bind.annotation.XmlElementRef;
import org.opengis.metadata.quality.Description;
-import org.apache.sis.metadata.iso.quality.DefaultDescription;
+import org.apache.sis.metadata.iso.quality.DefaultMeasureDescription;
import org.apache.sis.internal.jaxb.gco.PropertyType;
@@ -77,8 +77,8 @@ public final class DQM_Description extends
PropertyType<DQM_Description, Descrip
* @return the metadata to be marshalled.
*/
@XmlElementRef
- public DefaultDescription getElement() {
- return DefaultDescription.castOrCopy(metadata);
+ public DefaultMeasureDescription getElement() {
+ return DefaultMeasureDescription.castOrCopy(metadata);
}
/**
@@ -86,7 +86,7 @@ public final class DQM_Description extends
PropertyType<DQM_Description, Descrip
*
* @param metadata the unmarshalled metadata.
*/
- public void setElement(final DefaultDescription metadata) {
+ public void setElement(final DefaultMeasureDescription metadata) {
this.metadata = metadata;
}
}
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Measure.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Measure.java
index 9f0eb67d3f..26563d3502 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Measure.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQM_Measure.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.metadata;
import javax.xml.bind.annotation.XmlElementRef;
import org.opengis.metadata.quality.Measure;
-import org.apache.sis.metadata.iso.quality.DefaultMeasure;
+import org.apache.sis.metadata.iso.quality.DefaultQualityMeasure;
import org.apache.sis.internal.jaxb.gco.PropertyType;
@@ -77,8 +77,8 @@ public final class DQM_Measure extends
PropertyType<DQM_Measure, Measure> {
* @return the metadata to be marshalled.
*/
@XmlElementRef
- public DefaultMeasure getElement() {
- return DefaultMeasure.castOrCopy(metadata);
+ public DefaultQualityMeasure getElement() {
+ return DefaultQualityMeasure.castOrCopy(metadata);
}
/**
@@ -86,7 +86,7 @@ public final class DQM_Measure extends
PropertyType<DQM_Measure, Measure> {
*
* @param metadata the unmarshalled metadata.
*/
- public void setElement(final DefaultMeasure metadata) {
+ public void setElement(final DefaultQualityMeasure metadata) {
this.metadata = metadata;
}
}
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_StandaloneQualityReportInformation.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_StandaloneQualityReportInformation.java
index a4449f863e..cb94df4e17 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_StandaloneQualityReportInformation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_StandaloneQualityReportInformation.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.metadata;
import javax.xml.bind.annotation.XmlElementRef;
import org.opengis.metadata.quality.StandaloneQualityReportInformation;
-import
org.apache.sis.metadata.iso.quality.DefaultStandaloneQualityReportInformation;
+import org.apache.sis.metadata.iso.quality.DefaultEvaluationReportInformation;
import org.apache.sis.internal.jaxb.gco.PropertyType;
@@ -84,8 +84,8 @@ public final class DQ_StandaloneQualityReportInformation
extends
* @return the metadata to be marshalled.
*/
@XmlElementRef
- public DefaultStandaloneQualityReportInformation getElement() {
- return DefaultStandaloneQualityReportInformation.castOrCopy(metadata);
+ public DefaultEvaluationReportInformation getElement() {
+ return DefaultEvaluationReportInformation.castOrCopy(metadata);
}
/**
@@ -93,7 +93,7 @@ public final class DQ_StandaloneQualityReportInformation
extends
*
* @param metadata the unmarshalled metadata.
*/
- public void setElement(final DefaultStandaloneQualityReportInformation
metadata) {
+ public void setElement(final DefaultEvaluationReportInformation metadata) {
this.metadata = metadata;
}
}
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
index c526e165ae..428bb8a765 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameter.java
@@ -27,7 +27,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.referencing.operation.Matrix;
import org.apache.sis.metadata.iso.DefaultIdentifier;
-import org.apache.sis.metadata.iso.quality.DefaultDescription;
+import org.apache.sis.metadata.iso.quality.DefaultMeasureDescription;
import org.apache.sis.internal.jaxb.gco.GO_GenericName;
import org.apache.sis.util.Classes;
import org.apache.sis.util.iso.Names;
@@ -139,7 +139,7 @@ public final class QualityParameter extends Parameter {
}
InternationalString text = parameter.getDescription();
if (text != null) {
- description = new DefaultDescription(text);
+ description = new DefaultMeasureDescription(text);
}
valueType = parameter.getValueType();
valueStructure =
ValueStructure.valueOf(parameter.getValueClass()).orElse(null);
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
index 8a04d3dbb7..8524487ccb 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
@@ -31,7 +31,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.quality.Result;
import org.opengis.metadata.quality.Element;
-import org.opengis.metadata.quality.UsabilityElement;
+import org.opengis.metadata.quality.Usability;
import org.opengis.metadata.quality.Completeness;
import org.opengis.metadata.quality.TemporalQuality;
import org.opengis.metadata.quality.ThematicAccuracy;
@@ -98,9 +98,9 @@ import static
org.apache.sis.util.collection.Containers.isNullOrEmpty;
AbstractPositionalAccuracy.class,
AbstractThematicAccuracy.class,
AbstractTemporalQuality.class,
- DefaultUsabilityElement.class,
+ DefaultUsability.class,
AbstractMetaquality.class,
- DefaultMeasure.class // Not a subclass, but "weakly" associated.
+ DefaultQualityMeasure.class // Not a subclass, but "weakly" associated.
})
public class AbstractElement extends ISOMetadata implements Element {
/**
@@ -185,7 +185,7 @@ public class AbstractElement extends ISOMetadata implements
Element {
* <li>If the given object is {@code null}, then this method returns
{@code null}.</li>
* <li>Otherwise if the given object is an instance of {@link
PositionalAccuracy},
* {@link TemporalQuality}, {@link ThematicAccuracy}, {@link
LogicalConsistency},
- * {@link Completeness}, {@link UsabilityElement} or {@link
Metaquality},
+ * {@link Completeness}, {@link Usability} or {@link Metaquality},
* then this method delegates to the {@code castOrCopy(…)} method of
the corresponding SIS subclass.
* Note that if the given object implements more than one of the
above-cited interfaces,
* then the {@code castOrCopy(…)} method to be used is
unspecified.</li>
@@ -217,8 +217,8 @@ public class AbstractElement extends ISOMetadata implements
Element {
if (object instanceof Completeness) {
return AbstractCompleteness.castOrCopy((Completeness) object);
}
- if (object instanceof UsabilityElement) {
- return DefaultUsabilityElement.castOrCopy((UsabilityElement)
object);
+ if (object instanceof Usability) {
+ return DefaultUsability.castOrCopy((Usability) object);
}
if (object instanceof Metaquality) {
return AbstractMetaquality.castOrCopy((Metaquality) object);
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultStandaloneQualityReportInformation.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
similarity index 85%
rename from
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultStandaloneQualityReportInformation.java
rename to
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
index ed7ffc1810..63d88ad90e 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultStandaloneQualityReportInformation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationReportInformation.java
@@ -53,7 +53,7 @@ import
org.opengis.metadata.quality.StandaloneQualityReportInformation;
"abstract"
})
@XmlRootElement(name = "DQ_StandaloneQualityReportInformation")
-public class DefaultStandaloneQualityReportInformation extends ISOMetadata
implements StandaloneQualityReportInformation {
+public class DefaultEvaluationReportInformation extends ISOMetadata implements
StandaloneQualityReportInformation {
/**
* Serial number for inter-operability with different versions.
*/
@@ -74,7 +74,7 @@ public class DefaultStandaloneQualityReportInformation
extends ISOMetadata imple
/**
* Constructs an initially empty standalone quality report information.
*/
- public DefaultStandaloneQualityReportInformation() {
+ public DefaultEvaluationReportInformation() {
}
/**
@@ -86,7 +86,7 @@ public class DefaultStandaloneQualityReportInformation
extends ISOMetadata imple
*
* @see #castOrCopy(StandaloneQualityReportInformation)
*/
- public DefaultStandaloneQualityReportInformation(final
StandaloneQualityReportInformation object) {
+ public DefaultEvaluationReportInformation(final
StandaloneQualityReportInformation object) {
super(object);
if (object != null) {
reportReference = object.getReportReference();
@@ -101,9 +101,9 @@ public class DefaultStandaloneQualityReportInformation
extends ISOMetadata imple
* <ul>
* <li>If the given object is {@code null}, then this method returns
{@code null}.</li>
* <li>Otherwise if the given object is already an instance of
- * {@code DefaultStandaloneQualityReportInformation}, then it is
returned unchanged.</li>
- * <li>Otherwise a new {@code DefaultStandaloneQualityReportInformation}
instance is created using the
- * {@linkplain
#DefaultStandaloneQualityReportInformation(StandaloneQualityReportInformation)
copy constructor}
+ * {@code DefaultEvaluationReportInformation}, then it is returned
unchanged.</li>
+ * <li>Otherwise a new {@code DefaultEvaluationReportInformation}
instance is created using the
+ * {@linkplain
#DefaultEvaluationReportInformation(StandaloneQualityReportInformation) copy
constructor}
* and returned. Note that this is a <em>shallow</em> copy
operation, because the other
* metadata contained in the given object are not recursively
copied.</li>
* </ul>
@@ -112,11 +112,11 @@ public class DefaultStandaloneQualityReportInformation
extends ISOMetadata imple
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- public static DefaultStandaloneQualityReportInformation castOrCopy(final
StandaloneQualityReportInformation object) {
+ public static DefaultEvaluationReportInformation castOrCopy(final
StandaloneQualityReportInformation object) {
if (object instanceof StandaloneQualityReportInformation) {
- return
DefaultStandaloneQualityReportInformation.castOrCopy((DefaultStandaloneQualityReportInformation)
object);
+ return
DefaultEvaluationReportInformation.castOrCopy((DefaultEvaluationReportInformation)
object);
}
- return new DefaultStandaloneQualityReportInformation(object);
+ return new DefaultEvaluationReportInformation(object);
}
/**
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
similarity index 87%
rename from
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java
rename to
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
index 94c6ad764f..1f6a6c3c8a 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasureDescription.java
@@ -53,7 +53,7 @@ import org.apache.sis.xml.Namespaces;
"extendedDescription"
})
@XmlRootElement(name = "DQM_Description", namespace = Namespaces.DQM)
-public class DefaultDescription extends ISOMetadata implements Description {
+public class DefaultMeasureDescription extends ISOMetadata implements
Description {
/**
* Serial number for inter-operability with different versions.
*/
@@ -74,7 +74,7 @@ public class DefaultDescription extends ISOMetadata
implements Description {
/**
* Constructs an initially empty description.
*/
- public DefaultDescription() {
+ public DefaultMeasureDescription() {
}
/**
@@ -82,7 +82,7 @@ public class DefaultDescription extends ISOMetadata
implements Description {
*
* @param text text description, or {@code null} if none.
*/
- public DefaultDescription(final CharSequence text) {
+ public DefaultMeasureDescription(final CharSequence text) {
textDescription = Types.toInternationalString(text);
}
@@ -95,7 +95,7 @@ public class DefaultDescription extends ISOMetadata
implements Description {
*
* @see #castOrCopy(Description)
*/
- public DefaultDescription(final Description object) {
+ public DefaultMeasureDescription(final Description object) {
super(object);
if (object != null) {
textDescription = object.getTextDescription();
@@ -110,9 +110,9 @@ public class DefaultDescription extends ISOMetadata
implements Description {
* <ul>
* <li>If the given object is {@code null}, then this method returns
{@code null}.</li>
* <li>Otherwise if the given object is already an instance of
- * {@code DefaultDescription}, then it is returned unchanged.</li>
- * <li>Otherwise a new {@code DefaultDescription} instance is created
using the
- * {@linkplain #DefaultDescription(Description) copy constructor}
and returned.
+ * {@code DefaultMeasureDescription}, then it is returned
unchanged.</li>
+ * <li>Otherwise a new {@code DefaultMeasureDescription} instance is
created using the
+ * {@linkplain #DefaultMeasureDescription(Description) copy
constructor} and returned.
* Note that this is a <em>shallow</em> copy operation, because the
other
* metadata contained in the given object are not recursively
copied.</li>
* </ul>
@@ -121,11 +121,11 @@ public class DefaultDescription extends ISOMetadata
implements Description {
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- public static DefaultDescription castOrCopy(final Description object) {
- if (object == null || object instanceof DefaultDescription) {
- return (DefaultDescription) object;
+ public static DefaultMeasureDescription castOrCopy(final Description
object) {
+ if (object == null || object instanceof DefaultMeasureDescription) {
+ return (DefaultMeasureDescription) object;
}
- return new DefaultDescription(object);
+ return new DefaultMeasureDescription(object);
}
/**
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
similarity index 96%
rename from
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
rename to
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
index dfb4537dcb..bce5b0d225 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultMeasure.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQualityMeasure.java
@@ -74,7 +74,7 @@ import org.apache.sis.xml.Namespaces;
"parameters"
})
@XmlRootElement(name = "DQM_Measure", namespace = Namespaces.DQM)
-public class DefaultMeasure extends ISOMetadata implements Measure {
+public class DefaultQualityMeasure extends ISOMetadata implements Measure {
/**
* Serial number for inter-operability with different versions.
*/
@@ -156,7 +156,7 @@ public class DefaultMeasure extends ISOMetadata implements
Measure {
/**
* Constructs an initially empty element.
*/
- public DefaultMeasure() {
+ public DefaultQualityMeasure() {
}
/**
@@ -169,7 +169,7 @@ public class DefaultMeasure extends ISOMetadata implements
Measure {
* @see #castOrCopy(Measure)
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public DefaultMeasure(final Measure object) {
+ public DefaultQualityMeasure(final Measure object) {
super(object);
if (object != null) {
measureIdentifier = object.getMeasureIdentifier();
@@ -194,9 +194,9 @@ public class DefaultMeasure extends ISOMetadata implements
Measure {
* <ul>
* <li>If the given object is {@code null}, then this method returns
{@code null}.</li>
* <li>Otherwise if the given object is already an instance of
- * {@code DefaultMeasure}, then it is returned unchanged.</li>
- * <li>Otherwise a new {@code DefaultMeasure} instance is created using
the
- * {@linkplain #DefaultMeasure(Measure) copy constructor} and
returned.
+ * {@code DefaultQualityMeasure}, then it is returned unchanged.</li>
+ * <li>Otherwise a new {@code DefaultQualityMeasure} instance is created
using the
+ * {@linkplain #DefaultQualityMeasure(Measure) copy constructor} and
returned.
* Note that this is a <em>shallow</em> copy operation, because the
other
* metadata contained in the given object are not recursively
copied.</li>
* </ul>
@@ -205,11 +205,11 @@ public class DefaultMeasure extends ISOMetadata
implements Measure {
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- public static DefaultMeasure castOrCopy(final Measure object) {
- if (object instanceof DefaultMeasure) {
- return (DefaultMeasure) object;
+ public static DefaultQualityMeasure castOrCopy(final Measure object) {
+ if (object instanceof DefaultQualityMeasure) {
+ return (DefaultQualityMeasure) object;
}
- return new DefaultMeasure(object);
+ return new DefaultQualityMeasure(object);
}
/**
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
index 121931030f..8cb3fc591f 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
@@ -31,12 +31,12 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
* @since 0.3
* @module
*
- * @deprecated Renamed {@link DefaultUsabilityElement} for following a
renaming in ISO 19157:2013.
+ * @deprecated Removed from latest ISO 19157 standard.
*/
@Deprecated
@XmlType(name = "QE_Usability_Type", namespace = LegacyNamespaces.GMI)
@XmlRootElement(name = "QE_Usability", namespace = LegacyNamespaces.GMI)
-public class DefaultUsability extends DefaultUsabilityElement implements
Usability {
+public class DefaultUsability extends AbstractElement implements Usability {
/**
* Serial number for inter-operability with different versions.
*/
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsabilityElement.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsabilityElement.java
deleted file mode 100644
index 5d104a9e3c..0000000000
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsabilityElement.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.quality;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlRootElement;
-import org.opengis.metadata.quality.Usability;
-import org.opengis.metadata.quality.UsabilityElement;
-
-
-/**
- * Degree of adherence of a dataset to a specific set of requirements.
- * The following property is mandatory in a well-formed metadata according ISO
19157:
- *
- * <div class="preformat">{@code DQ_UsabilityElement}
- * {@code └─result……………} Value obtained from applying a data quality
measure.</div>
- *
- * <h2>Limitations</h2>
- * <ul>
- * <li>Instances of this class are not synchronized for multi-threading.
- * Synchronization, if needed, is caller's responsibility.</li>
- * <li>Serialized objects of this class are not guaranteed to be compatible
with future Apache SIS releases.
- * Serialization support is appropriate for short term storage or RMI
between applications running the
- * same version of Apache SIS. For long term storage, use {@link
org.apache.sis.xml.XML} instead.</li>
- * </ul>
- *
- * @author Martin Desruisseaux (IRD, Geomatys)
- * @author Alexis Gaillard (Geomatys)
- * @version 1.3
- * @since 1.3
- * @module
- */
-@XmlType(name = "DQ_UsabilityElement_Type")
-@XmlRootElement(name = "DQ_UsabilityElement")
-@XmlSeeAlso({
- DefaultUsability.class
-})
-public class DefaultUsabilityElement extends AbstractElement implements
UsabilityElement {
- /**
- * Serial number for inter-operability with different versions.
- */
- private static final long serialVersionUID = 8385667875833802576L;
-
- /**
- * Constructs an initially empty relative internal positional accuracy.
- */
- public DefaultUsabilityElement() {
- }
-
- /**
- * Constructs a new instance initialized with the values from the
specified metadata object.
- * This is a <em>shallow</em> copy constructor, because the other metadata
contained in the
- * given object are not recursively copied.
- *
- * @param object the metadata to copy values from, or {@code null} if
none.
- *
- * @see #castOrCopy(UsabilityElement)
- */
- public DefaultUsabilityElement(final UsabilityElement object) {
- super(object);
- }
-
- /**
- * Returns a SIS metadata implementation with the values of the given
arbitrary implementation.
- * This method performs the first applicable action in the following
choices:
- *
- * <ul>
- * <li>If the given object is {@code null}, then this method returns
{@code null}.</li>
- * <li>Otherwise if the given object is already an instance of
- * {@code DefaultUsabilityElement}, then it is returned
unchanged.</li>
- * <li>Otherwise a new {@code DefaultUsabilityElement} instance is
created using the
- * {@linkplain #DefaultUsabilityElement(UsabilityElement) copy
constructor} and returned.
- * Note that this is a <em>shallow</em> copy operation, because the
other
- * metadata contained in the given object are not recursively
copied.</li>
- * </ul>
- *
- * @param object the object to get as a SIS implementation, or {@code
null} if none.
- * @return a SIS implementation containing the values of the given object
(may be the
- * given object itself), or {@code null} if the argument was null.
- */
- @SuppressWarnings("deprecation")
- public static DefaultUsabilityElement castOrCopy(final UsabilityElement
object) {
- if (object instanceof Usability) {
- return DefaultUsability.castOrCopy((Usability) object);
- }
- if (object == null || object instanceof DefaultUsabilityElement) {
- return (DefaultUsabilityElement) object;
- }
- return new DefaultUsabilityElement(object);
- }
-}
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
index b51c43b2f7..8c53a55d1c 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.metadata.quality.ValueStructure;
import org.apache.sis.util.iso.Names;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.metadata.iso.quality.DefaultDescription;
+import org.apache.sis.metadata.iso.quality.DefaultMeasureDescription;
import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
import org.junit.Test;
@@ -48,7 +48,7 @@ public final strictfp class QualityParameterTest extends
TestCase {
final QualityParameter param = new QualityParameter();
param.code = "some parameter";
param.definition = new SimpleInternationalString("a definition");
- param.description = new DefaultDescription("a description");
+ param.description = new DefaultMeasureDescription("a description");
param.valueStructure = ValueStructure.MATRIX;
param.valueType = Names.createTypeName(Integer.class);
return param;
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
index d6f133dc60..a2595eced0 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
@@ -174,7 +174,7 @@ public final strictfp class AllMetadataTest extends
PropertyConsistencyCheck {
org.opengis.metadata.quality.CoverageResult.class,
org.opengis.metadata.quality.DataEvaluation.class,
org.opengis.metadata.quality.DataQuality.class,
- org.opengis.metadata.quality.Description.class,
+// org.opengis.metadata.quality.Description.class, //
Pending ISO 19157:2022 renaming.
org.opengis.metadata.quality.DescriptiveResult.class,
org.opengis.metadata.quality.DomainConsistency.class,
org.opengis.metadata.quality.Element.class,
@@ -186,7 +186,7 @@ public final strictfp class AllMetadataTest extends
PropertyConsistencyCheck {
org.opengis.metadata.quality.Homogeneity.class,
org.opengis.metadata.quality.IndirectEvaluation.class,
org.opengis.metadata.quality.LogicalConsistency.class,
- org.opengis.metadata.quality.Measure.class,
+// org.opengis.metadata.quality.Measure.class, //
Pending ISO 19157:2022 renaming.
org.opengis.metadata.quality.MeasureReference.class,
org.opengis.metadata.quality.Metaquality.class,
org.opengis.metadata.quality.NonQuantitativeAttributeAccuracy.class,
@@ -199,7 +199,7 @@ public final strictfp class AllMetadataTest extends
PropertyConsistencyCheck {
org.opengis.metadata.quality.Result.class,
org.opengis.metadata.quality.SampleBasedInspection.class,
org.opengis.metadata.quality.SourceReference.class,
-
org.opengis.metadata.quality.StandaloneQualityReportInformation.class,
+//
org.opengis.metadata.quality.StandaloneQualityReportInformation.class, //
Pending ISO 19157:2022 renaming.
org.opengis.metadata.quality.TemporalAccuracy.class,
org.opengis.metadata.quality.TemporalConsistency.class,
org.opengis.metadata.quality.TemporalQuality.class,
@@ -208,7 +208,6 @@ public final strictfp class AllMetadataTest extends
PropertyConsistencyCheck {
org.opengis.metadata.quality.ThematicClassificationCorrectness.class,
org.opengis.metadata.quality.TopologicalConsistency.class,
org.opengis.metadata.quality.Usability.class,
- org.opengis.metadata.quality.UsabilityElement.class,
org.opengis.metadata.quality.ValueStructure.class,
org.opengis.metadata.spatial.CellGeometry.class,
org.opengis.metadata.spatial.Dimension.class,
