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 9c4a34851d Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore. 9c4a34851d is described below commit 9c4a34851d7aba17cfb0c80642d921646085dccd Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Dec 13 10:49:32 2022 +0100 Add `since` tag into `@Deprecated` annotations. Remove 4 deprecated methods that where not used anymore. --- .../jaxb/metadata/CI_ResponsibleParty.java | 2 +- .../iso/DefaultExtendedElementInformation.java | 16 +++---- .../apache/sis/metadata/iso/DefaultMetadata.java | 50 +++++++++++----------- .../sis/metadata/iso/citation/DefaultCitation.java | 6 +-- .../sis/metadata/iso/citation/DefaultContact.java | 12 +++--- .../iso/citation/DefaultResponsibleParty.java | 18 ++++---- .../metadata/iso/citation/DefaultTelephone.java | 10 ++--- .../iso/constraint/DefaultReleasability.java | 26 +---------- .../sis/metadata/iso/constraint/package-info.java | 2 +- .../iso/content/DefaultCoverageDescription.java | 8 ++-- .../DefaultFeatureCatalogueDescription.java | 8 ++-- .../iso/content/DefaultRangeDimension.java | 4 +- .../metadata/iso/distribution/DefaultDataFile.java | 6 +-- .../DefaultDigitalTransferOptions.java | 4 +- .../metadata/iso/distribution/DefaultFormat.java | 12 +++--- .../metadata/iso/distribution/DefaultMedium.java | 4 +- .../distribution/DefaultStandardOrderProcess.java | 24 ----------- .../iso/identification/AbstractIdentification.java | 4 +- .../DefaultAggregateInformation.java | 10 ++--- .../identification/DefaultDataIdentification.java | 8 ++-- .../metadata/iso/lineage/DefaultProcessStep.java | 4 +- .../sis/metadata/iso/lineage/DefaultSource.java | 8 ++-- .../maintenance/DefaultMaintenanceInformation.java | 12 +++--- .../sis/metadata/iso/quality/AbstractElement.java | 28 ++++++------ .../iso/quality/AbstractTemporalAccuracy.java | 2 +- .../iso/quality/DefaultCoverageResult.java | 6 +-- .../metadata/iso/quality/DefaultDataQuality.java | 6 +-- .../DefaultNonQuantitativeAttributeAccuracy.java | 2 +- .../iso/quality/DefaultQuantitativeResult.java | 6 +-- .../sis/metadata/iso/quality/DefaultScope.java | 6 +-- .../sis/metadata/iso/quality/DefaultUsability.java | 2 +- .../org/apache/sis/util/iso/DefaultRecordType.java | 2 +- .../main/java/org/apache/sis/xml/Namespaces.java | 2 +- .../sis/internal/referencing/provider/Affine.java | 2 +- .../referencing/provider/GeodeticOperation.java | 2 +- .../referencing/provider/MapProjection.java | 4 +- .../referencing/provider/MapProjection3D.java | 6 +-- .../DefaultCoordinateOperationFactory.java | 2 +- .../operation/DefaultOperationMethod.java | 14 +++--- .../transform/DefaultMathTransformFactory.java | 4 +- .../org/apache/sis/internal/storage/gpx/Store.java | 2 +- .../org/apache/sis/internal/storage/gpx/Types.java | 2 +- .../sis/internal/storage/gpx/WritableStore.java | 2 +- 43 files changed, 156 insertions(+), 204 deletions(-) diff --git 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 index 328e9fce15..e051f79e31 100644 --- 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 @@ -43,7 +43,7 @@ import org.apache.sis.internal.jaxb.FilterByVersion; * @since 0.3 * @module */ -@Deprecated +@Deprecated(since="1.0") public final class CI_ResponsibleParty extends PropertyType<CI_ResponsibleParty, ResponsibleParty> { /** * Empty constructor for JAXB only. diff --git 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 index 0bfd97296e..7be8a0822f 100644 --- 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 @@ -111,7 +111,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex /** * Short form suitable for use in an implementation method such as XML or SGML. */ - @Deprecated + @Deprecated(since="1.0") private String shortName; /** @@ -119,7 +119,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * Non-null only if the {@linkplain #getDataType() data type} * is {@linkplain Datatype#CODE_LIST_ELEMENT code list element}. */ - @Deprecated + @Deprecated(since="1.0") private Integer domainCode; /** @@ -314,7 +314,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * @deprecated Removed as of ISO 19115:2014. */ @Override - @Deprecated + @Deprecated(since="1.0") @XmlElement(name = "shortName", namespace = LegacyNamespaces.GMD) public String getShortName() { return FilterByVersion.LEGACY_METADATA.accept() ? shortName : null; @@ -327,7 +327,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * * @deprecated Removed as of ISO 19115:2014. */ - @Deprecated + @Deprecated(since="1.0") public void setShortName(final String newValue) { checkWritePermission(shortName); shortName = newValue; @@ -343,7 +343,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * @deprecated Removed as of ISO 19115:2014. */ @Override - @Deprecated + @Deprecated(since="1.0") @XmlElement(name = "domainCode", namespace = LegacyNamespaces.GMD) public Integer getDomainCode() { return FilterByVersion.LEGACY_METADATA.accept() ? domainCode : null; @@ -356,7 +356,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * * @deprecated Removed as of ISO 19115:2014. */ - @Deprecated + @Deprecated(since="1.0") public void setDomainCode(final Integer newValue) { checkWritePermission(domainCode); domainCode = newValue; @@ -574,7 +574,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * @return reason for creating the extended element. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getRationale") public Collection<InternationalString> getRationales() { return new AbstractSet<InternationalString>() { @@ -607,7 +607,7 @@ public class DefaultExtendedElementInformation extends ISOMetadata implements Ex * * @param newValues the new rationales. */ - @Deprecated + @Deprecated(since="1.0") public void setRationales(final Collection<? extends InternationalString> newValues) { setRationale(LegacyPropertyAdapter.getSingleton(newValues, InternationalString.class, null, DefaultExtendedElementInformation.class, "setRationales")); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java index a64a2031e0..500c310ead 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java @@ -503,7 +503,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * in order to include the codespace attribute. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMetadataIdentifier") @XmlElement(name = "fileIdentifier", namespace = LegacyNamespaces.GMD) public String getFileIdentifier() { @@ -521,7 +521,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated As of ISO 19115:2014, replaced by {@link #setMetadataIdentifier(Identifier)} */ - @Deprecated + @Deprecated(since="1.0") public void setFileIdentifier(final String newValue) { // See "Note about deprecated methods implementation" DefaultIdentifier identifier = DefaultIdentifier.castOrCopy(super.getIdentifier()); @@ -591,7 +591,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.keySet()</code>. */ - @Deprecated + @Deprecated(since="1.0", forRemoval=true) @Dependencies("getLocalesAndCharsets") public Collection<Locale> getLanguages() { // TODO: delete after SIS 1.0 release (method not needed by JAXB). @@ -609,7 +609,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by putting keys in {@link #getLocalesAndCharsets()} map. */ - @Deprecated + @Deprecated(since="1.0", forRemoval=true) public void setLanguages(final Collection<Locale> newValues) { // TODO: delete after SIS 1.0 release (method not needed by JAXB). setLocalesAndCharsets(LocaleAndCharset.setLanguages(getLocalesAndCharsets(), newValues)); @@ -623,7 +623,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.keySet()</code>. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") @XmlElement(name = "language", namespace = LegacyNamespaces.GMD) public Locale getLanguage() { @@ -647,7 +647,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.put(newValue, …)</code>. */ - @Deprecated + @Deprecated(since="1.0") public void setLanguage(final Locale newValue) { setLocalesAndCharsets(OtherLocales.setFirst(locales, new PT_Locale(newValue))); } @@ -660,7 +660,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.keySet()</code>. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") @XmlElement(name = "locale", namespace = LegacyNamespaces.GMD) @XmlJavaTypeAdapter(LocaleAdapter.Wrapped.class) @@ -706,7 +706,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.values()</code>. */ - @Deprecated + @Deprecated(since="1.0", forRemoval=true) @Dependencies("getLocalesAndCharsets") public Collection<Charset> getCharacterSets() { // TODO: delete after SIS 1.0 release (method not needed by JAXB). @@ -722,7 +722,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by putting values in {@link #getLocalesAndCharsets()} map. */ - @Deprecated + @Deprecated(since="1.0", forRemoval=true) public void setCharacterSets(final Collection<? extends Charset> newValues) { // TODO: delete after SIS 1.0 release (method not needed by JAXB). setLocalesAndCharsets(LocaleAndCharset.setCharacterSets(getLocalesAndCharsets(), newValues)); @@ -736,7 +736,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.values()</code>. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") // @XmlElement at the end of this class. public CharacterSet getCharacterSet() { @@ -751,7 +751,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated Replaced by <code>{@linkplain #getLocalesAndCharsets()}.put(…, newValue)</code>. */ - @Deprecated + @Deprecated(since="1.0") public void setCharacterSet(final CharacterSet newValue) { setCharacterSets(CollectionsExt.singletonOrEmpty((newValue != null) ? newValue.toCharset() : null)); } @@ -791,7 +791,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #getParentMetadata()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getParentMetadata") @XmlElement(name = "parentIdentifier", namespace = LegacyNamespaces.GMD) public String getParentIdentifier() { @@ -814,7 +814,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated As of ISO 19115:2014, replaced by {@link #getParentMetadata()}. */ - @Deprecated + @Deprecated(since="1.0") public void setParentIdentifier(final String newValue) { checkWritePermission(parentMetadata); // See "Note about deprecated methods implementation" @@ -863,7 +863,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * followed by {@link DefaultMetadataScope#getResourceScope()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMetadataScopes") @XmlElement(name = "hierarchyLevel", namespace = LegacyNamespaces.GMD) public final Collection<ScopeCode> getHierarchyLevels() { @@ -898,7 +898,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #setMetadataScopes(Collection)} * and {@link DefaultMetadataScope#setResourceScope(ScopeCode)}. */ - @Deprecated + @Deprecated(since="1.0") public void setHierarchyLevels(final Collection<? extends ScopeCode> newValues) { checkWritePermission(ImplementationHelper.valueIfDefined(metadataScopes)); ((LegacyPropertyAdapter<ScopeCode,?>) getHierarchyLevels()).setValues(newValues); @@ -913,7 +913,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * followed by {@link DefaultMetadataScope#getName()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMetadataScopes") @XmlElement(name = "hierarchyLevelName", namespace = LegacyNamespaces.GMD) public final Collection<String> getHierarchyLevelNames() { @@ -949,7 +949,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #setMetadataScopes(Collection)} * and {@link DefaultMetadataScope#setName(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.0") public void setHierarchyLevelNames(final Collection<? extends String> newValues) { checkWritePermission(ImplementationHelper.valueIfDefined(metadataScopes)); ((LegacyPropertyAdapter<String,?>) getHierarchyLevelNames()).setValues(newValues); @@ -1010,7 +1010,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #getDateInfo()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getDateInfo") @XmlElement(name = "dateStamp", namespace = LegacyNamespaces.GMD) public Date getDateStamp() { @@ -1034,7 +1034,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * * @deprecated As of ISO 19115:2014, replaced by {@link #setDateInfo(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setDateStamp(final Date newValue) { checkWritePermission(ImplementationHelper.valueIfDefined(dateInfo)); Collection<CitationDate> newValues = dateInfo; // See "Note about deprecated methods implementation" @@ -1200,7 +1200,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * followed by {@link DefaultCitation#getTitle()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMetadataStandards") @XmlElement(name = "metadataStandardName", namespace = LegacyNamespaces.GMD) public String getMetadataStandardName() { @@ -1215,7 +1215,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #getMetadataStandards()} * followed by {@link DefaultCitation#setTitle(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.0") public void setMetadataStandardName(final String newValue) { setMetadataStandard(false, newValue); } @@ -1229,7 +1229,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * followed by {@link DefaultCitation#getEdition()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMetadataStandards") @XmlElement(name = "metadataStandardVersion", namespace = LegacyNamespaces.GMD) public String getMetadataStandardVersion() { @@ -1244,7 +1244,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * @deprecated As of ISO 19115:2014, replaced by {@link #getMetadataStandards()} * followed by {@link DefaultCitation#setEdition(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.0") public void setMetadataStandardVersion(final String newValue) { setMetadataStandard(true, newValue); } @@ -1282,7 +1282,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * {@link DefaultDataIdentification#getCitation()} followed by {@link DefaultCitation#getOnlineResources()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getIdentificationInfo") @XmlElement(name = "dataSetURI", namespace = LegacyNamespaces.GMD) public String getDataSetUri() { @@ -1324,7 +1324,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { * followed by {@link DefaultDataIdentification#getCitation()} * followed by {@link DefaultCitation#setOnlineResources(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setDataSetUri(final String newValue) throws URISyntaxException { final URI uri = (newValue != null) ? new URI(newValue) : null; Collection<Identification> info = identificationInfo; // See "Note about deprecated methods implementation" diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java index 00b50feef1..a86994dba1 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java @@ -165,7 +165,7 @@ public class DefaultCitation extends ISOMetadata implements Citation { * * @deprecated Removed as of ISO 19115:2014. */ - @Deprecated + @Deprecated(since="1.0") @SuppressWarnings("serial") private InternationalString collectiveTitle; @@ -499,7 +499,7 @@ public class DefaultCitation extends ISOMetadata implements Citation { * @deprecated Removed as of ISO 19115:2014. */ @Override - @Deprecated + @Deprecated(since="1.0") @XmlElement(name = "collectiveTitle", namespace = LegacyNamespaces.GMD) public InternationalString getCollectiveTitle() { return FilterByVersion.LEGACY_METADATA.accept() ? collectiveTitle : null; @@ -513,7 +513,7 @@ public class DefaultCitation extends ISOMetadata implements Citation { * * @deprecated Removed as of ISO 19115:2014. */ - @Deprecated + @Deprecated(since="1.0") public void setCollectiveTitle(final InternationalString newValue) { checkWritePermission(collectiveTitle); collectiveTitle = newValue; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java index 3bf34be9c7..f65028c68f 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java @@ -232,7 +232,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * @deprecated As of ISO 19115:2014, replaced by {@link #getPhones()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getPhones") @XmlElement(name = "phone", namespace = LegacyNamespaces.GMD) public Telephone getPhone() { @@ -272,7 +272,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * * @deprecated As of ISO 19115:2014, replaced by {@link #setPhones(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setPhone(Telephone newValue) { Collection<Telephone> newValues = null; if (newValue != null) { @@ -324,7 +324,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * @deprecated As of ISO 19115:2014, replaced by {@link #getAddresses()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getAddresses") @XmlElement(name = "address", namespace = LegacyNamespaces.GMD) public Address getAddress() { @@ -342,7 +342,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * * @deprecated As of ISO 19115:2014, replaced by {@link #setAddresses(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setAddress(final Address newValue) { setAddresses(CollectionsExt.singletonOrEmpty(newValue)); } @@ -380,7 +380,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * @deprecated As of ISO 19115:2014, replaced by {@link #getOnlineResources()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getOnlineResources") @XmlElement(name = "onlineResource", namespace = LegacyNamespaces.GMD) public OnlineResource getOnlineResource() { @@ -398,7 +398,7 @@ public class DefaultContact extends ISOMetadata implements Contact { * * @deprecated As of ISO 19115:2014, replaced by {@link #setOnlineResources(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setOnlineResource(final OnlineResource newValue) { setOnlineResources(CollectionsExt.singletonOrEmpty(newValue)); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java index dc9359aa13..5e8f5bf5bd 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java @@ -60,7 +60,7 @@ import static org.apache.sis.internal.metadata.ImplementationHelper.valueIfDefin * @since 0.3 * @module */ -@Deprecated +@Deprecated(since="1.0") @XmlType(name = "CI_ResponsibleParty_Type", namespace = LegacyNamespaces.GMD, propOrder = { "individualName", "organisationName", @@ -235,7 +235,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * @deprecated As of ISO 19115:2014, replaced by {@code getName()} in {@link DefaultIndividual}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getParties") @XmlElement(name = "individualName") public String getIndividualName() { @@ -255,7 +255,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * * @deprecated As of ISO 19115:2014, replaced by {@code setName(InternationalString)} in {@link DefaultIndividual}. */ - @Deprecated + @Deprecated(since="1.0") public void setIndividualName(final String newValue) { setName(Individual.class, false, Types.toInternationalString(newValue), DefaultResponsibleParty::individual); } @@ -280,7 +280,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * @deprecated As of ISO 19115:2014, replaced by {@code getName()} in {@link DefaultOrganisation}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getParties") @XmlElement(name = "organisationName") public InternationalString getOrganisationName() { @@ -299,7 +299,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * * @deprecated As of ISO 19115:2014, replaced by {@code setName(InternationalString)} in {@link DefaultOrganisation}. */ - @Deprecated + @Deprecated(since="1.0") public void setOrganisationName(final InternationalString newValue) { setName(Organisation.class, false, newValue, DefaultResponsibleParty::organisation); } @@ -325,7 +325,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * @deprecated As of ISO 19115:2014, replaced by {@link DefaultIndividual#getPositionName()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getParties") @XmlElement(name = "positionName") public InternationalString getPositionName() { @@ -344,7 +344,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * * @deprecated As of ISO 19115:2014, replaced by {@link DefaultIndividual#setPositionName(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.0") public void setPositionName(final InternationalString newValue) { setName(DefaultIndividual.class, true, newValue, DefaultResponsibleParty::position); } @@ -367,7 +367,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * @deprecated As of ISO 19115:2014, replaced by {@link AbstractParty#getContactInfo()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getParties") @XmlElement(name = "contactInfo") public Contact getContactInfo() { @@ -397,7 +397,7 @@ public class DefaultResponsibleParty extends DefaultResponsibility implements Re * * @deprecated As of ISO 19115:2014, replaced by {@link AbstractParty#setContactInfo(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setContactInfo(final Contact newValue) { final Collection<Party> parties = getParties(); checkWritePermission(valueIfDefined(parties)); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java index d627e72654..17a8901433 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java @@ -221,7 +221,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * * @deprecated This field will be removed after we removed the deprecated public methods. */ - @Deprecated + @Deprecated(since="1.0") @SuppressWarnings("serial") private Collection<Telephone> owner; @@ -277,7 +277,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * with {@link TelephoneType#VOICE}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies({"getNumber", "getNumberType"}) @XmlElement(name = "voice", namespace = LegacyNamespaces.GMD) public final Collection<String> getVoices() { @@ -297,7 +297,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * @deprecated As of ISO 19115:2014, replaced by a {@linkplain #setNumber(String) number} * with {@link TelephoneType#VOICE}. */ - @Deprecated + @Deprecated(since="1.0") public void setVoices(final Collection<? extends String> newValues) { ((LegacyTelephones) getVoices()).setValues(newValues); } @@ -313,7 +313,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * with {@link TelephoneType#FACSIMILE}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies({"getNumber", "getNumberType"}) @XmlElement(name = "facsimile", namespace = LegacyNamespaces.GMD) public final Collection<String> getFacsimiles() { @@ -333,7 +333,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * @deprecated As of ISO 19115:2014, replaced by a {@linkplain #setNumber(String) number} * with {@link TelephoneType#FACSIMILE}. */ - @Deprecated + @Deprecated(since="1.0") public void setFacsimiles(final Collection<? extends String> newValues) { ((LegacyTelephones) getFacsimiles()).setValues(newValues); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java index 0a33bd6a5d..d482dba13c 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java @@ -40,7 +40,7 @@ import org.apache.sis.metadata.iso.ISOMetadata; * </ul> * * @author Martin Desruisseaux (Geomatys) - * @version 1.1 + * @version 1.4 * @since 0.5 * @module */ @@ -143,18 +143,6 @@ public class DefaultReleasability extends ISOMetadata implements Releasability { addressees = writeCollection(newValues, addressees, Responsibility.class); } - /** - * Sets the parties to which the release statement applies. - * - * @param newValues the new parties. - * - * @deprecated Renamed {@link #setAddressees(Collection)}. - */ - @Deprecated - public void getAddressees(final Collection<? extends Responsibility> newValues) { - setAddressees(newValues); - } - /** * Returns the release statement. * @@ -195,16 +183,4 @@ public class DefaultReleasability extends ISOMetadata implements Releasability { public void setDisseminationConstraints(final Collection<? extends Restriction> newValues) { disseminationConstraints = writeCollection(newValues, disseminationConstraints, Restriction.class); } - - /** - * Sets the components in determining releasability. - * - * @param newValues the new components. - * - * @deprecated Renamed {@link #setDisseminationConstraints(Collection)}. - */ - @Deprecated - public void getDisseminationConstraints(final Collection<? extends Restriction> newValues) { - setDisseminationConstraints(newValues); - } } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java index 0fd540e5d2..6dff323a53 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java @@ -64,7 +64,7 @@ * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.0 + * @version 1.4 * @since 0.3 * @module */ diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java index 7ba05e437f..65c6315a7e 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java @@ -246,7 +246,7 @@ public class DefaultCoverageDescription extends AbstractContentInformation imple * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getContentTypes()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getAttributeGroups") @XmlElement(name = "contentType", namespace = LegacyNamespaces.GMD) public CoverageContentType getContentType() { @@ -281,7 +281,7 @@ public class DefaultCoverageDescription extends AbstractContentInformation imple * * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setContentTypes(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setContentType(final CoverageContentType newValue) { checkWritePermission(valueIfDefined(attributeGroups)); final Collection<CoverageContentType> newValues = CollectionsExt.singletonOrEmpty(newValue); @@ -313,7 +313,7 @@ public class DefaultCoverageDescription extends AbstractContentInformation imple * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getAttributes()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getAttributeGroups") @XmlElement(name = "dimension", namespace = LegacyNamespaces.GMD) public final Collection<RangeDimension> getDimensions() { @@ -351,7 +351,7 @@ public class DefaultCoverageDescription extends AbstractContentInformation imple * * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setAttributes(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setDimensions(final Collection<? extends RangeDimension> newValues) { checkWritePermission(valueIfDefined(attributeGroups)); ((LegacyPropertyAdapter<RangeDimension,?>) getDimensions()).setValues(newValues); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java index 9ab74e96b0..7c115a7a5c 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java @@ -218,7 +218,7 @@ public class DefaultFeatureCatalogueDescription extends AbstractContentInformati * @deprecated Replaced by {@code getLocalesAndCharsets().keySet()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") @XmlElement(name = "language", namespace = LegacyNamespaces.GMD) public Collection<Locale> getLanguages() { @@ -232,7 +232,7 @@ public class DefaultFeatureCatalogueDescription extends AbstractContentInformati * * @deprecated Replaced by putting keys in {@link #getLocalesAndCharsets()} map. */ - @Deprecated + @Deprecated(since="1.0") public void setLanguages(final Collection<? extends Locale> newValues) { // TODO: delete after SIS 1.0 release (method not needed by JAXB). setLocalesAndCharsets(LocaleAndCharset.setLanguages(getLocalesAndCharsets(), newValues)); @@ -291,7 +291,7 @@ public class DefaultFeatureCatalogueDescription extends AbstractContentInformati * @deprecated As of ISO 19115:2014, replaced by {@link #getFeatureTypeInfo()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getFeatureTypeInfo") @XmlElement(name = "featureTypes", namespace = LegacyNamespaces.GMD) public final Collection<GenericName> getFeatureTypes() { @@ -325,7 +325,7 @@ public class DefaultFeatureCatalogueDescription extends AbstractContentInformati * * @deprecated As of ISO 19115:2014, replaced by {@link #setFeatureTypeInfo(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setFeatureTypes(final Collection<? extends GenericName> newValues) { checkWritePermission(valueIfDefined(featureTypes)); ((LegacyPropertyAdapter<GenericName,?>) getFeatureTypes()).setValues(newValues); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java index c4cbc449ec..645d84184a 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java @@ -201,7 +201,7 @@ public class DefaultRangeDimension extends ISOMetadata implements RangeDimension * @deprecated As of ISO 19115:2014, renamed {@link #getDescription()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getDescription") @XmlElement(name = "descriptor", namespace = LegacyNamespaces.GMD) public InternationalString getDescriptor() { @@ -216,7 +216,7 @@ public class DefaultRangeDimension extends ISOMetadata implements RangeDimension * * @deprecated As of ISO 19115:2014, renamed {@link #setDescription(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.0") public void setDescriptor(final InternationalString newValue) { setDescription(newValue); } diff --git 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 index b96c27a724..7778189001 100644 --- 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 @@ -108,7 +108,7 @@ public class DefaultDataFile extends ISOMetadata implements DataFile { * * @deprecated Removed in latest XSD schemas. */ - @Deprecated + @Deprecated(since="1.0") @SuppressWarnings("serial") private Format fileFormat; @@ -273,7 +273,7 @@ public class DefaultDataFile extends ISOMetadata implements DataFile { * @deprecated Removed in latest XSD schemas. */ @Override - @Deprecated + @Deprecated(since="1.0") @XmlElement(name = "fileFormat", namespace = LegacyNamespaces.GMX) public Format getFileFormat() { return FilterByVersion.LEGACY_METADATA.accept() ? fileFormat : null; @@ -286,7 +286,7 @@ public class DefaultDataFile extends ISOMetadata implements DataFile { * * @deprecated Removed in latest XSD schemas. */ - @Deprecated + @Deprecated(since="1.0") public void setFileFormat(final Format newValue) { checkWritePermission(fileFormat); fileFormat = newValue; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java index fb4dd7de6c..b68a6d97fa 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java @@ -273,7 +273,7 @@ public class DefaultDigitalTransferOptions extends ISOMetadata implements Digita * @deprecated As of ISO 19115:2014, replaced by {@link #getOffLines()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getOffLines") public Medium getOffLine() { return LegacyPropertyAdapter.getSingleton(getOffLines(), Medium.class, null, DefaultDigitalTransferOptions.class, "getOffLine"); @@ -286,7 +286,7 @@ public class DefaultDigitalTransferOptions extends ISOMetadata implements Digita * * @deprecated As of ISO 19115:2014, replaced by {@link #setOffLines(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setOffLine(final Medium newValue) { setOffLines(CollectionsExt.singletonOrEmpty(newValue)); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java index 01e9d67c8c..8f7c125057 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java @@ -244,7 +244,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * <code>{@linkplain #getFormatSpecificationCitation()}.{@linkplain DefaultCitation#getTitle() getTitle()}</code>. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getFormatSpecificationCitation") @XmlElement(name = "specification", namespace = LegacyNamespaces.GMD) public InternationalString getSpecification() { @@ -266,7 +266,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * <code>{@linkplain #getFormatSpecificationCitation()}.{@linkplain DefaultCitation#setTitle(InternationalString) * setTitle(InternationalString)}</code>. */ - @Deprecated + @Deprecated(since="1.0") public void setSpecification(final InternationalString newValue) { checkWritePermission(formatSpecificationCitation); setFormatSpecificationCitation((citation, value) -> citation.setTitle(value), newValue); @@ -282,7 +282,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * getAlternateTitles()}</code>. Note that citation alternate titles are often used for abbreviations. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getFormatSpecificationCitation") @XmlElement(name = "name", namespace = LegacyNamespaces.GMD) public InternationalString getName() { @@ -305,7 +305,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * <code>{@linkplain #getFormatSpecificationCitation()}.{@linkplain DefaultCitation#setAlternateTitles(Collection) * setAlternateTitles(Collection)}</code>. */ - @Deprecated + @Deprecated(since="1.0") public void setName(final InternationalString newValue) { checkWritePermission(formatSpecificationCitation); setFormatSpecificationCitation((citation, value) -> @@ -322,7 +322,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * getEdition()}</code>. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getFormatSpecificationCitation") @XmlElement(name = "version", namespace = LegacyNamespaces.GMD) public InternationalString getVersion() { @@ -344,7 +344,7 @@ public class DefaultFormat extends ISOMetadata implements Format { * <code>{@linkplain #getFormatSpecificationCitation()}.{@linkplain DefaultCitation#setEdition(InternationalString) * setEdition(InternationalString)}</code>. */ - @Deprecated + @Deprecated(since="1.0") public void setVersion(final InternationalString newValue) { checkWritePermission(formatSpecificationCitation); setFormatSpecificationCitation((citation, value) -> citation.setEdition(value), newValue); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java index 12de531947..0de6e10a44 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java @@ -242,7 +242,7 @@ public class DefaultMedium extends ISOMetadata implements Medium { * @return density at which the data is recorded, or {@code null}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getDensity") @XmlElement(name = "density", namespace = LegacyNamespaces.GMD) public Collection<Double> getDensities() { @@ -276,7 +276,7 @@ public class DefaultMedium extends ISOMetadata implements Medium { * * @param newValues the new densities. */ - @Deprecated + @Deprecated(since="1.0") public void setDensities(final Collection<? extends Double> newValues) { setDensity(LegacyPropertyAdapter.getSingleton(newValues, Double.class, null, DefaultMedium.class, "setDensities")); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java index bc83e2023a..9b6513d451 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java @@ -307,18 +307,6 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements Standard return orderOptionsType; } - /** - * @deprecated Renamed {@link #getOrderOptionsType()} for ISO 19115 conformance. - * - * @return description of the order options record, or {@code null} if none. - * - * @since 0.5 - */ - @Deprecated - public RecordType getOrderOptionType() { - return getOrderOptionsType(); - } - /** * Sets the description of the {@linkplain #getOrderOptions() order options} record. * @@ -331,18 +319,6 @@ public class DefaultStandardOrderProcess extends ISOMetadata implements Standard orderOptionsType = newValue; } - /** - * @deprecated Renamed {@link #setOrderOptionsType(RecordType)} for ISO 19115 conformance. - * - * @param newValue new description of the order options record. - * - * @since 0.5 - */ - @Deprecated - public void setOrderOptionType(final RecordType newValue) { - setOrderOptionsType(newValue); - } - /** * Returns the request/purchase choices. * diff --git 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 index c05c1b3854..854fbd198d 100644 --- 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 @@ -792,7 +792,7 @@ public class AbstractIdentification extends ISOMetadata implements Identificatio * @deprecated As of ISO 19115:2014, replaced by {@link #getAssociatedResources()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getAssociatedResources") @XmlElement(name = "aggregationInfo", namespace = LegacyNamespaces.GMD) public Collection<AggregateInformation> getAggregationInfo() { @@ -819,7 +819,7 @@ public class AbstractIdentification extends ISOMetadata implements Identificatio * * @deprecated As of ISO 19115:2014, replaced by {@link #setAssociatedResources(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setAggregationInfo(final Collection<? extends AggregateInformation> newValues) { setAssociatedResources(newValues); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java index 6f644b555a..33547aea1b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java @@ -69,7 +69,7 @@ import org.apache.sis.internal.jaxb.code.DS_InitiativeTypeCode; * * @deprecated As of ISO 19115:2014, replaced by {@link DefaultAssociatedResource}. */ -@Deprecated +@Deprecated(since="1.0") @XmlType(name = "MD_AggregateInformation_Type", namespace = LegacyNamespaces.GMD, propOrder = { "aggregateDataSetName", "aggregateDataSetIdentifier", @@ -135,7 +135,7 @@ public class DefaultAggregateInformation extends DefaultAssociatedResource imple * @deprecated As of ISO 19115:2014, replaced by {@link #getName()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getName") @XmlElement(name = "aggregateDataSetName") public Citation getAggregateDataSetName() { @@ -149,7 +149,7 @@ public class DefaultAggregateInformation extends DefaultAssociatedResource imple * * @deprecated As of ISO 19115:2014, replaced by {@link #setName(Citation)}. */ - @Deprecated + @Deprecated(since="1.0") public void setAggregateDataSetName(final Citation newValue) { setName(newValue); } @@ -162,7 +162,7 @@ public class DefaultAggregateInformation extends DefaultAssociatedResource imple * @deprecated As of ISO 19115:2014, replaced by the first identifier of {@link #getAggregateDataSetName()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getName") @XmlElement(name = "aggregateDataSetIdentifier") public Identifier getAggregateDataSetIdentifier() { @@ -192,7 +192,7 @@ public class DefaultAggregateInformation extends DefaultAssociatedResource imple * * @deprecated As of ISO 19115:2014, replaced by an identifier of {@link #getAggregateDataSetName()}. */ - @Deprecated + @Deprecated(since="1.0") public void setAggregateDataSetIdentifier(final Identifier newValue) { checkWritePermission(super.getName()); Citation name = getAggregateDataSetName(); diff --git 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 index 5b65169573..da521123ad 100644 --- 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 @@ -225,7 +225,7 @@ public class DefaultDataIdentification extends AbstractIdentification implements * @deprecated Replaced by {@code getLocalesAndCharsets().keySet()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") @XmlElement(name = "language", namespace = LegacyNamespaces.GMD) public Collection<Locale> getLanguages() { @@ -239,7 +239,7 @@ public class DefaultDataIdentification extends AbstractIdentification implements * * @deprecated Replaced by putting keys in {@link #getLocalesAndCharsets()} map. */ - @Deprecated + @Deprecated(since="1.0") public void setLanguages(final Collection<? extends Locale> newValues) { // TODO: delete after SIS 1.0 release (method not needed by JAXB). setLocalesAndCharsets(LocaleAndCharset.setLanguages(getLocalesAndCharsets(), newValues)); @@ -253,7 +253,7 @@ public class DefaultDataIdentification extends AbstractIdentification implements * @deprecated Replaced by {@code getLocalesAndCharsets().values()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getLocalesAndCharsets") @XmlElement(name = "characterSet", namespace = LegacyNamespaces.GMD) public Collection<Charset> getCharacterSets() { @@ -267,7 +267,7 @@ public class DefaultDataIdentification extends AbstractIdentification implements * * @deprecated Replaced by putting values in {@link #getLocalesAndCharsets()} map. */ - @Deprecated + @Deprecated(since="1.0") public void setCharacterSets(final Collection<? extends Charset> newValues) { // TODO: delete after SIS 1.0 release (method not needed by JAXB). setLocalesAndCharsets(LocaleAndCharset.setCharacterSets(getLocalesAndCharsets(), newValues)); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java index 05def94f58..9552501c88 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java @@ -293,7 +293,7 @@ public class DefaultProcessStep extends ISOMetadata implements ProcessStep { * @deprecated As of ISO 19115-1:2014, replaced by {@link #getStepDateTime()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @XmlElement(name = "dateTime", namespace = LegacyNamespaces.GMD) public Date getDate() { return FilterByVersion.LEGACY_METADATA.accept() ? TemporalUtilities.getDate(getStepDateTime()) : null; @@ -306,7 +306,7 @@ public class DefaultProcessStep extends ISOMetadata implements ProcessStep { * * @deprecated As of ISO 19115-1:2014, replaced by {@link #setStepDateTime(TemporalPrimitive)}. */ - @Deprecated + @Deprecated(since="1.0") public void setDate(final Date newValue) { setStepDateTime(TemporalUtilities.createInstant(newValue)); } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java index ba3d8893c8..142dc22b05 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java @@ -282,7 +282,7 @@ public class DefaultSource extends ISOMetadata implements Source { * @deprecated As of ISO 19115:2014, moved to {@link DefaultResolution#getEquivalentScale()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getSourceSpatialResolution") @XmlElement(name = "scaleDenominator", namespace = LegacyNamespaces.GMD) public RepresentativeFraction getScaleDenominator() { @@ -304,7 +304,7 @@ public class DefaultSource extends ISOMetadata implements Source { * * @deprecated As of ISO 19115:2014, moved to {@link DefaultResolution#setEquivalentScale(RepresentativeFraction)}. */ - @Deprecated + @Deprecated(since="1.0") public void setScaleDenominator(final RepresentativeFraction newValue) { checkWritePermission(sourceSpatialResolution); Resolution resolution = null; @@ -428,7 +428,7 @@ public class DefaultSource extends ISOMetadata implements Source { * @deprecated As of ISO 19115:2014, moved to {@link DefaultScope#getExtents()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getScope") @XmlElement(name = "sourceExtent", namespace = LegacyNamespaces.GMD) public Collection<Extent> getSourceExtents() { @@ -457,7 +457,7 @@ public class DefaultSource extends ISOMetadata implements Source { * * @deprecated As of ISO 19115:2014, moved to {@link DefaultScope#setExtents(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setSourceExtents(final Collection<? extends Extent> newValues) { checkWritePermission(scope); Scope scope = this.scope; diff --git 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 index 11ef5bf091..ab65c4842f 100644 --- 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 @@ -245,7 +245,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * was added to that code list. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMaintenanceDates") @XmlElement(name = "dateOfNextUpdate", namespace = LegacyNamespaces.GMD) public Date getDateOfNextUpdate() { @@ -268,7 +268,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * * @param newValue the new date of next update. */ - @Deprecated + @Deprecated(since="1.0") public void setDateOfNextUpdate(final Date newValue) { checkWritePermission(valueIfDefined(maintenanceDates)); Collection<CitationDate> dates = maintenanceDates; @@ -354,7 +354,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * that includes a spatial and temporal extent. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMaintenanceScopes") @XmlElement(name = "updateScope", namespace = LegacyNamespaces.GMD) public final Collection<ScopeCode> getUpdateScopes() { @@ -389,7 +389,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * * @deprecated As of ISO 19115:2014, replaced by {@link #setMaintenanceScopes(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setUpdateScopes(final Collection<? extends ScopeCode> newValues) { checkWritePermission(valueIfDefined(maintenanceScopes)); ((LegacyPropertyAdapter<ScopeCode,?>) getUpdateScopes()).setValues(newValues); @@ -406,7 +406,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * that includes a spatial and temporal extent. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getMaintenanceScopes") @XmlElement(name = "updateScopeDescription", namespace = LegacyNamespaces.GMD) public final Collection<ScopeDescription> getUpdateScopeDescriptions() { @@ -444,7 +444,7 @@ public class DefaultMaintenanceInformation extends ISOMetadata implements Mainte * * @deprecated As of ISO 19115:2014, replaced by {@link #setMaintenanceScopes(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setUpdateScopeDescriptions(final Collection<? extends ScopeDescription> newValues) { checkWritePermission(valueIfDefined(maintenanceScopes)); ((LegacyPropertyAdapter<ScopeDescription,?>) getUpdateScopeDescriptions()).setValues(newValues); 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 8524487ccb..7eb81714d1 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 @@ -316,7 +316,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultMeasureReference#getNamesOfMeasure()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getMeasureReference") @XmlElement(name = "nameOfMeasure", namespace = LegacyNamespaces.GMD) public Collection<InternationalString> getNamesOfMeasure() { @@ -343,7 +343,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultMeasureReference#setNamesOfMeasure(Collection)}. */ - @Deprecated + @Deprecated(since="1.3") public void setNamesOfMeasure(final Collection<? extends InternationalString> newValues) { if (!isNullOrEmpty(newValues)) { setMeasureReferenceProperty(DefaultMeasureReference::setNamesOfMeasure, newValues); @@ -358,7 +358,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultMeasureReference#getMeasureIdentification()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getMeasureReference") @XmlElement(name = "measureIdentification", namespace = LegacyNamespaces.GMD) public Identifier getMeasureIdentification() { @@ -372,7 +372,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultMeasureReference#setMeasureIdentification(Identifier)}. */ - @Deprecated + @Deprecated(since="1.3") public void setMeasureIdentification(final Identifier newValue) { setMeasureReferenceProperty(DefaultMeasureReference::setMeasureIdentification, newValue); } @@ -385,7 +385,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultMeasureReference#getMeasureDescription()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getMeasureReference") @XmlElement(name = "measureDescription", namespace = LegacyNamespaces.GMD) public InternationalString getMeasureDescription() { @@ -399,7 +399,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultMeasureReference#setMeasureDescription(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.3") public void setMeasureDescription(final InternationalString newValue) { setMeasureReferenceProperty(DefaultMeasureReference::setMeasureDescription, newValue); } @@ -463,7 +463,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultEvaluationMethod#getEvaluationMethodType()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getEvaluationMethod") @XmlElement(name = "evaluationMethodType", namespace = LegacyNamespaces.GMD) public EvaluationMethodType getEvaluationMethodType() { @@ -477,7 +477,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultEvaluationMethod#setEvaluationMethodType(EvaluationMethodType)}. */ - @Deprecated + @Deprecated(since="1.3") public void setEvaluationMethodType(final EvaluationMethodType newValue) { setEvaluationMethodProperty(DefaultEvaluationMethod::setEvaluationMethodType, newValue); } @@ -490,7 +490,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultEvaluationMethod#getEvaluationMethodDescription()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getEvaluationMethod") @XmlElement(name = "evaluationMethodDescription", namespace = LegacyNamespaces.GMD) public InternationalString getEvaluationMethodDescription() { @@ -504,7 +504,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultEvaluationMethod#setEvaluationMethodDescription(InternationalString)}. */ - @Deprecated + @Deprecated(since="1.3") public void setEvaluationMethodDescription(final InternationalString newValue) { setEvaluationMethodProperty(DefaultEvaluationMethod::setEvaluationMethodDescription, newValue); } @@ -517,7 +517,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultEvaluationMethod#getEvaluationProcedure()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getEvaluationMethod") @XmlElement(name = "evaluationProcedure", namespace = LegacyNamespaces.GMD) public Citation getEvaluationProcedure() { @@ -531,7 +531,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultEvaluationMethod#setEvaluationProcedure(Citation)}. */ - @Deprecated + @Deprecated(since="1.3") public void setEvaluationProcedure(final Citation newValue) { setEvaluationMethodProperty(DefaultEvaluationMethod::setEvaluationProcedure, newValue); } @@ -546,7 +546,7 @@ public class AbstractElement extends ISOMetadata implements Element { * @deprecated Replaced by {@link DefaultEvaluationMethod#getDates()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @Dependencies("getEvaluationMethod") @XmlElement(name = "dateTime", namespace = LegacyNamespaces.GMD) public Collection<Date> getDates() { @@ -572,7 +572,7 @@ public class AbstractElement extends ISOMetadata implements Element { * * @deprecated Replaced by {@link DefaultEvaluationMethod#setDates(Collection)}. */ - @Deprecated + @Deprecated(since="1.3") public void setDates(final Collection<? extends Date> newValues) { if (!isNullOrEmpty(newValues)) { setEvaluationMethodProperty(DefaultEvaluationMethod::setDates, new DateToTemporal(newValues)); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java index 14fabc0218..44c2898528 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java @@ -36,7 +36,7 @@ import org.apache.sis.xml.Namespaces; * * @deprecated Renamed {@link AbstractTemporalQuality} for following a renaming in ISO 19157:2013. */ -@Deprecated +@Deprecated(since="1.3") @XmlType(name = "AbstractDQ_TemporalAccuracy_Type", namespace = Namespaces.GMD) @XmlRootElement(name = "AbstractDQ_TemporalAccuracy", namespace = Namespaces.GMD) public class AbstractTemporalAccuracy extends AbstractTemporalQuality implements TemporalAccuracy { diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java index b0ce581f43..1b81370a45 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java @@ -97,7 +97,7 @@ public class DefaultCoverageResult extends AbstractResult implements CoverageRes * * @deprecated Replaced by {@link #resultContent}. */ - @Deprecated + @Deprecated(since="1.3") @SuppressWarnings("serial") private CoverageDescription resultContentDescription; @@ -242,7 +242,7 @@ public class DefaultCoverageResult extends AbstractResult implements CoverageRes * @deprecated Replaced by {@link #getResultContent()}. */ @Override - @Deprecated + @Deprecated(since="1.3") @XmlElement(name = "resultContentDescription", namespace = LegacyNamespaces.GMI) public CoverageDescription getResultContentDescription() { return FilterByVersion.LEGACY_METADATA.accept() ? resultContentDescription : null; @@ -256,7 +256,7 @@ public class DefaultCoverageResult extends AbstractResult implements CoverageRes * * @deprecated Replaced by {@link #setResultContent(Collection)}. */ - @Deprecated + @Deprecated(since="1.3") public void setResultContentDescription(final CoverageDescription newValue) { checkWritePermission(resultContentDescription); resultContentDescription = newValue; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java index 52d582d37b..e3155f3e66 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java @@ -88,7 +88,7 @@ public class DefaultDataQuality extends ISOMetadata implements DataQuality { * * @deprecated Removed from ISO 19157:2013. */ - @Deprecated + @Deprecated(since="1.3") @SuppressWarnings("serial") private Lineage lineage; @@ -247,7 +247,7 @@ public class DefaultDataQuality extends ISOMetadata implements DataQuality { * @deprecated Removed from ISO 19157:2013. */ @Override - @Deprecated + @Deprecated(since="1.3") @XmlElement(name = "lineage", namespace = LegacyNamespaces.GMD) public Lineage getLineage() { return FilterByVersion.LEGACY_METADATA.accept() ? lineage : null; @@ -260,7 +260,7 @@ public class DefaultDataQuality extends ISOMetadata implements DataQuality { * * @deprecated Removed from ISO 19157:2013. */ - @Deprecated + @Deprecated(since="1.3") public void setLineage(final Lineage newValue) { checkWritePermission(lineage); lineage = newValue; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java index 5466553801..2a0b3052ff 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java @@ -32,7 +32,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces; * * @deprecated Renamed {@link DefaultNonQuantitativeAttributeCorrectness} for following a renaming in ISO 19157:2013. */ -@Deprecated +@Deprecated(since="1.3") @XmlType(name = "DQ_NonQuantitativeAttributeAccuracy_Type", namespace = LegacyNamespaces.GMD) @XmlRootElement(name = "DQ_NonQuantitativeAttributeAccuracy", namespace = LegacyNamespaces.GMD) public class DefaultNonQuantitativeAttributeAccuracy extends DefaultNonQuantitativeAttributeCorrectness diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java index 80f3966fed..d6627a549d 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java @@ -91,7 +91,7 @@ public class DefaultQuantitativeResult extends AbstractResult implements Quantit * * @deprecated Removed from ISO 19157:2013. */ - @Deprecated + @Deprecated(since="1.3") @SuppressWarnings("serial") private InternationalString errorStatistic; @@ -235,7 +235,7 @@ public class DefaultQuantitativeResult extends AbstractResult implements Quantit * @deprecated Removed from ISO_19157:2013. */ @Override - @Deprecated + @Deprecated(since="1.3") @XmlElement(name = "errorStatistic", namespace = LegacyNamespaces.GMD) public InternationalString getErrorStatistic() { return FilterByVersion.LEGACY_METADATA.accept() ? errorStatistic : null; @@ -248,7 +248,7 @@ public class DefaultQuantitativeResult extends AbstractResult implements Quantit * * @deprecated Removed from ISO_19157:2013. */ - @Deprecated + @Deprecated(since="1.3") public void setErrorStatistic(final InternationalString newValue) { checkWritePermission(errorStatistic); errorStatistic = newValue; diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java index 65776fcd0b..7bc6f34d7b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java @@ -47,7 +47,7 @@ import org.apache.sis.internal.util.CollectionsExt; * @deprecated As of ISO 19115:2014, {@code DQ_Scope} has been replaced by {@code MD_Scope}. * The latter is defined in the {@link org.apache.sis.metadata.iso.maintenance} package. */ -@Deprecated +@Deprecated(since="1.0") @XmlTransient public class DefaultScope extends org.apache.sis.metadata.iso.maintenance.DefaultScope implements Scope { /** @@ -117,7 +117,7 @@ public class DefaultScope extends org.apache.sis.metadata.iso.maintenance.Defaul * @deprecated As of ISO 19115:2014, replaced by {@link #getExtents()}. */ @Override - @Deprecated + @Deprecated(since="1.0") @Dependencies("getExtents") public Extent getExtent() { return LegacyPropertyAdapter.getSingleton(getExtents(), Extent.class, null, DefaultScope.class, "getExtent"); @@ -131,7 +131,7 @@ public class DefaultScope extends org.apache.sis.metadata.iso.maintenance.Defaul * * @deprecated As of ISO 19115:2014, replaced by {@link #setExtents(Collection)}. */ - @Deprecated + @Deprecated(since="1.0") public void setExtent(final Extent newValue) { setExtents(CollectionsExt.singletonOrEmpty(newValue)); } 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 8cb3fc591f..5951d54136 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 @@ -33,7 +33,7 @@ import org.apache.sis.internal.xml.LegacyNamespaces; * * @deprecated Removed from latest ISO 19157 standard. */ -@Deprecated +@Deprecated(since="1.3") @XmlType(name = "QE_Usability_Type", namespace = LegacyNamespaces.GMI) @XmlRootElement(name = "QE_Usability", namespace = LegacyNamespaces.GMI) public class DefaultUsability extends AbstractElement implements Usability { diff --git a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java index 087364b7a8..ee1683dea4 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java @@ -318,7 +318,7 @@ public class DefaultRecordType extends RecordDefinition implements RecordType, S * @deprecated The {@code RecordSchema} interface has been removed in the 2015 revision of ISO 19103 standard. */ @Override - @Deprecated + @Deprecated(since="1.0") public RecordSchema getContainer() { return container; } diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java index 032fdbf6d9..07d018b8c4 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Namespaces.java @@ -462,7 +462,7 @@ public final class Namespaces extends Static { * * @deprecated as of ISO 19115-3, splitted in many different namespaces. */ - @Deprecated + @Deprecated(since="1.0") public static final String GMD = LegacyNamespaces.GMD; /** diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java index 50d6789271..23ab5c31b4 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java @@ -215,7 +215,7 @@ public final class Affine extends AbstractProvider { * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ @Override - @Deprecated + @Deprecated(since="1.1") public OperationMethod redimension(final int sourceDimensions, final int targetDimensions) { return getProvider(sourceDimensions, targetDimensions, false); } diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java index a850d936dd..675c792e5c 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java @@ -118,7 +118,7 @@ abstract class GeodeticOperation extends AbstractProvider { * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ @Override - @Deprecated + @Deprecated(since="1.1") public final OperationMethod redimension(final int sourceDimensions, final int targetDimensions) { if (redimensioned != null && (sourceDimensions & ~1) == 2 && (targetDimensions & ~1) == 2) { final GeodeticOperation m = redimensioned[((sourceDimensions & 1) << 1) | (targetDimensions & 1)]; diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java index a11b28bcb6..84e2a7846c 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java @@ -178,7 +178,7 @@ public abstract class MapProjection extends AbstractProvider { * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ - @Deprecated + @Deprecated(since="1.1") private OperationMethod redimensioned; /** @@ -207,7 +207,7 @@ public abstract class MapProjection extends AbstractProvider { * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ @Override - @Deprecated + @Deprecated(since="1.1") public final OperationMethod redimension(final int sourceDimensions, final int targetDimensions) { if (sourceDimensions != 3 || targetDimensions != 3) { return super.redimension(sourceDimensions, targetDimensions); diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection3D.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection3D.java index 890e57cb07..d8fd33d191 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection3D.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection3D.java @@ -35,7 +35,7 @@ import org.opengis.util.FactoryException; * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ -@Deprecated +@Deprecated(since="1.1") @XmlTransient final class MapProjection3D extends AbstractProvider { /** @@ -48,7 +48,7 @@ final class MapProjection3D extends AbstractProvider { * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ - @Deprecated + @Deprecated(since="1.1") private final MapProjection redimensioned; /** @@ -68,7 +68,7 @@ final class MapProjection3D extends AbstractProvider { * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ @Override - @Deprecated + @Deprecated(since="1.1") public OperationMethod redimension(final int sourceDimensions, final int targetDimensions) { if (sourceDimensions == 2 && targetDimensions == 2) { return redimensioned; diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java index 3f8a768c9b..b49c6b475a 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java @@ -877,7 +877,7 @@ next: for (int i=components.size(); --i >= 0;) { * @deprecated Replaced by {@link #createOperation(CoordinateReferenceSystem, CoordinateReferenceSystem, CoordinateOperationContext)}. */ @Override - @Deprecated + @Deprecated(since="0.7") public CoordinateOperation createOperation(final CoordinateReferenceSystem sourceCRS, final CoordinateReferenceSystem targetCRS, final OperationMethod method) diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java index c953838d50..86e0d10ca0 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java @@ -170,7 +170,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ - @Deprecated + @Deprecated(since="1.1") private Integer sourceDimensions; /** @@ -185,7 +185,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ - @Deprecated + @Deprecated(since="1.1") private Integer targetDimensions; /** @@ -264,7 +264,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * * @deprecated ISO 19111:2019 removed "source dimensions" and "target dimensions" attributes. */ - @Deprecated + @Deprecated(since="1.1") public DefaultOperationMethod(final Map<String,?> properties, final Integer sourceDimensions, final Integer targetDimensions, @@ -476,7 +476,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * @deprecated Not needed anymore since ISO 19111:2019 removed the * "source dimensions" and "target dimensions" attributes. */ - @Deprecated + @Deprecated(since="1.1") public static OperationMethod redimension(OperationMethod method, final int sourceDimensions, final int targetDimensions) { @@ -518,7 +518,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * * @deprecated ISO 19111:2019 removed source/target dimensions attributes. */ - @Deprecated + @Deprecated(since="1.1") public OperationMethod redimension(final int sourceDimensions, final int targetDimensions) { return redimension(this, sourceDimensions, this.sourceDimensions, targetDimensions, this.targetDimensions); @@ -601,7 +601,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * @deprecated This attribute has been removed from ISO 19111:2019. */ @Override - @Deprecated + @Deprecated(since="1.1") @XmlElement(name = "sourceDimensions") @XmlSchemaType(name = "positiveInteger") public Integer getSourceDimensions() { @@ -619,7 +619,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * @deprecated This attribute has been removed from ISO 19111:2019. */ @Override - @Deprecated + @Deprecated(since="1.1") @XmlElement(name = "targetDimensions") @XmlSchemaType(name = "positiveInteger") public Integer getTargetDimensions() { diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java index 3c941a2cd0..6135a73afe 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java @@ -528,7 +528,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math * where the {@code Context} argument can be null. */ @Override - @Deprecated + @Deprecated(since="0.7") public MathTransform createParameterizedTransform(final ParameterValueGroup parameters) throws NoSuchIdentifierException, FactoryException { @@ -1483,7 +1483,7 @@ public class DefaultMathTransformFactory extends AbstractFactory implements Math * @deprecated Replaced by {@link #createParameterizedTransform(ParameterValueGroup, Context)}. */ @Override - @Deprecated + @Deprecated(since="0.7") public MathTransform createBaseToDerived(final CoordinateReferenceSystem baseCRS, final ParameterValueGroup parameters, final CoordinateSystem derivedCS) throws NoSuchIdentifierException, FactoryException diff --git a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java index 5d20ef12b2..da0f246f30 100644 --- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java +++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java @@ -203,7 +203,7 @@ public class Store extends StaxDataStore implements FeatureSet { * @deprecated We are not sure yet if we will keep this method. Decision is pending acquisition of * more experience with the API proposed by {@link org.apache.sis.storage.FeatureSet}. */ - @Deprecated + @Deprecated(since="0.8") public FeatureType getFeatureType(final String name) throws IllegalNameException { return types.names.get(this, name); } diff --git a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java index c1fb0a9d95..c1807c50af 100644 --- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java +++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java @@ -99,7 +99,7 @@ final class Types { * @deprecated We are not sure yet if we will keep this field. Decision is pending acquisition of * more experience with the API proposed by {@link org.apache.sis.storage.FeatureSet}. */ - @Deprecated + @Deprecated(since="0.8") final FeatureNaming<FeatureType> names; /** diff --git a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/WritableStore.java b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/WritableStore.java index a4ced88d7e..817ec098a6 100644 --- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/WritableStore.java +++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/WritableStore.java @@ -147,7 +147,7 @@ public final class WritableStore extends Store implements WritableFeatureSet { * * @see <a href="https://issues.apache.org/jira/browse/SIS-411">SIS-411</a> */ - @Deprecated + @Deprecated(since="1.3") public synchronized void write(final Metadata metadata, final Stream<? extends Feature> features) throws DataStoreException { try { /*