You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/09/12 18:20:55 UTC
[sis] branch geoapi-3.1 updated (e84fbdf -> ddbee3b)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git.
from e84fbdf Merge branch 'geoapi-4.0' into geoapi-3.1
add b94b082 First round of removal of classes/methods deprecated in SIS 1.0. This commit removes only the classes and methods having no dependencies in SIS.
add 25e21ce Remove the deprecated WarningListeners class and interface.
add 3f0bf11 Delete deprecated DistanceUtils class (replaced by GeodeticCalculator) and remove LatLonPointRadius from public API.
add 7762360 Bug fix: MetadataCopier.copy(type, metadata) should accept a type which is a super-type of the interface implemented by the given metadata instance.
add 1387466 Remove the deprecated ModifiableMetadata.unmodifiable() method.
add 1cbed34 Remove more deprecated methods: DefaultEllipsoid.orthodromicDistance, XML.DEFAULT_NAMESPACE.
new ddbee3b Merge branch 'geoapi-4.0' into geoapi-3.1: removal of deprecated methods.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sis/feature/builder/FeatureTypeBuilder.java | 9 -
.../java/org/apache/sis/internal/jaxb/Context.java | 14 +-
.../apache/sis/internal/metadata/Identifiers.java | 4 +-
.../apache/sis/internal/metadata/Resources.java | 2 +-
.../sis/internal/metadata/Resources.properties | 2 +-
.../sis/internal/metadata/Resources_fr.properties | 2 +-
.../org/apache/sis/metadata/MetadataCopier.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 120 +------
.../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 35 +-
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 2 +-
.../metadata/iso/citation/DefaultTelephone.java | 4 +-
.../apache/sis/metadata/sql/CachedStatement.java | 25 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 15 -
.../apache/sis/metadata/sql/MetadataSource.java | 77 ++---
.../org/apache/sis/metadata/sql/package-info.java | 2 +-
.../java/org/apache/sis/xml/MarshallerPool.java | 8 +-
.../main/java/org/apache/sis/xml/Namespaces.java | 22 --
.../src/main/java/org/apache/sis/xml/Pooled.java | 18 +-
.../src/main/java/org/apache/sis/xml/XML.java | 31 +-
.../main/java/org/apache/sis/xml/package-info.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 15 +
.../apache/sis/metadata/MetadataStandardTest.java | 4 +-
.../metadata/iso/citation/DefaultCitationTest.java | 17 -
.../referencing/gazetteer/FinalLocationType.java | 20 +-
.../sis/referencing/gazetteer/package-info.java | 2 +-
.../referencing/gazetteer/LocationTypeTest.java | 2 +-
.../org/apache/sis/distance/DistanceUtils.java | 102 ------
.../apache/sis/geometry/GeneralDirectPosition.java | 18 -
.../sis/metadata/iso/ImmutableIdentifier.java | 166 ---------
.../main/java/org/apache/sis/referencing/CRS.java | 11 -
.../java/org/apache/sis/referencing/CommonCRS.java | 4 +-
.../apache/sis/referencing/IdentifiedObjects.java | 12 +-
.../apache/sis/referencing/cs/AxesConvention.java | 9 -
.../sis/referencing/datum/DefaultEllipsoid.java | 119 -------
.../org/apache/sis/referencing/datum/Sphere.java | 28 +-
.../apache/sis/referencing/datum/package-info.java | 3 +-
.../operation/transform/MathTransforms.java | 2 +-
.../operation/transform/PassThroughTransform.java | 13 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../apache/sis/distance/LatLonPointRadiusTest.java | 89 -----
.../referencing/datum/DefaultEllipsoidTest.java | 81 -----
.../test/integration/CoordinateOperationTest.java | 79 ++---
.../sis/test/suite/ReferencingTestSuite.java | 3 -
.../java/org/apache/sis/util/CharSequences.java | 2 +-
.../java/org/apache/sis/util/ComparisonMode.java | 18 -
.../main/java/org/apache/sis/util/Utilities.java | 10 -
.../java/org/apache/sis/util/logging/Logging.java | 28 +-
.../apache/sis/util/logging/QuietLogRecord.java | 73 ----
.../apache/sis/util/logging/WarningListener.java | 93 -----
.../apache/sis/util/logging/WarningListeners.java | 376 ---------------------
.../org/apache/sis/util/logging/package-info.java | 2 +-
.../apache/sis/test/suite/UtilityTestSuite.java | 1 -
.../sis/util/logging/WarningListenersTest.java | 118 -------
.../apache/sis/index/tree}/LatLonPointRadius.java | 61 +---
.../java/org/apache/sis/index/tree/QuadTree.java | 1 -
.../sis/internal/storage/io/ChannelFactory.java | 8 +-
.../java/org/apache/sis/storage/DataStore.java | 52 ---
.../apache/sis/storage/event/StoreListeners.java | 68 +---
.../org/apache/sis/storage/event/package-info.java | 2 +-
.../internal/storage/xml/stream/StaxDataStore.java | 2 +-
63 files changed, 192 insertions(+), 1926 deletions(-)
delete mode 100644 core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java
delete mode 100644 core/sis-referencing/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
delete mode 100644 core/sis-referencing/src/test/java/org/apache/sis/distance/LatLonPointRadiusTest.java
delete mode 100644 core/sis-utility/src/main/java/org/apache/sis/util/logging/QuietLogRecord.java
delete mode 100644 core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java
delete mode 100644 core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
delete mode 100644 core/sis-utility/src/test/java/org/apache/sis/util/logging/WarningListenersTest.java
rename {core/sis-referencing/src/main/java/org/apache/sis/distance => storage/sis-storage/src/main/java/org/apache/sis/index/tree}/LatLonPointRadius.java (69%)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: removal of
deprecated methods.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ddbee3b39dca63c3a3d0f1c1f4d5ba0c4a46e6ca
Merge: e84fbdf 1cbed34
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Sep 12 20:20:21 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: removal of deprecated methods.
.../sis/feature/builder/FeatureTypeBuilder.java | 9 -
.../java/org/apache/sis/internal/jaxb/Context.java | 14 +-
.../apache/sis/internal/metadata/Identifiers.java | 4 +-
.../apache/sis/internal/metadata/Resources.java | 2 +-
.../sis/internal/metadata/Resources.properties | 2 +-
.../sis/internal/metadata/Resources_fr.properties | 2 +-
.../org/apache/sis/metadata/MetadataCopier.java | 2 +-
.../apache/sis/metadata/ModifiableMetadata.java | 120 +------
.../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 2 +-
.../sis/metadata/iso/citation/Citations.java | 35 +-
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../sis/metadata/iso/citation/DefaultContact.java | 2 +-
.../metadata/iso/citation/DefaultTelephone.java | 4 +-
.../apache/sis/metadata/sql/CachedStatement.java | 25 +-
.../apache/sis/metadata/sql/MetadataFallback.java | 15 -
.../apache/sis/metadata/sql/MetadataSource.java | 77 ++---
.../org/apache/sis/metadata/sql/package-info.java | 2 +-
.../java/org/apache/sis/xml/MarshallerPool.java | 8 +-
.../main/java/org/apache/sis/xml/Namespaces.java | 22 --
.../src/main/java/org/apache/sis/xml/Pooled.java | 18 +-
.../src/main/java/org/apache/sis/xml/XML.java | 31 +-
.../main/java/org/apache/sis/xml/package-info.java | 2 +-
.../apache/sis/metadata/MetadataCopierTest.java | 15 +
.../apache/sis/metadata/MetadataStandardTest.java | 4 +-
.../metadata/iso/citation/DefaultCitationTest.java | 17 -
.../referencing/gazetteer/FinalLocationType.java | 20 +-
.../sis/referencing/gazetteer/package-info.java | 2 +-
.../referencing/gazetteer/LocationTypeTest.java | 2 +-
.../org/apache/sis/distance/DistanceUtils.java | 102 ------
.../apache/sis/geometry/GeneralDirectPosition.java | 18 -
.../sis/metadata/iso/ImmutableIdentifier.java | 166 ---------
.../main/java/org/apache/sis/referencing/CRS.java | 11 -
.../java/org/apache/sis/referencing/CommonCRS.java | 4 +-
.../apache/sis/referencing/IdentifiedObjects.java | 12 +-
.../apache/sis/referencing/cs/AxesConvention.java | 9 -
.../sis/referencing/datum/DefaultEllipsoid.java | 119 -------
.../org/apache/sis/referencing/datum/Sphere.java | 28 +-
.../apache/sis/referencing/datum/package-info.java | 3 +-
.../operation/transform/MathTransforms.java | 2 +-
.../operation/transform/PassThroughTransform.java | 13 +-
.../org/apache/sis/referencing/package-info.java | 2 +-
.../apache/sis/distance/LatLonPointRadiusTest.java | 89 -----
.../referencing/datum/DefaultEllipsoidTest.java | 81 -----
.../test/integration/CoordinateOperationTest.java | 79 ++---
.../sis/test/suite/ReferencingTestSuite.java | 3 -
.../java/org/apache/sis/util/CharSequences.java | 2 +-
.../java/org/apache/sis/util/ComparisonMode.java | 18 -
.../main/java/org/apache/sis/util/Utilities.java | 10 -
.../java/org/apache/sis/util/logging/Logging.java | 28 +-
.../apache/sis/util/logging/QuietLogRecord.java | 73 ----
.../apache/sis/util/logging/WarningListener.java | 93 -----
.../apache/sis/util/logging/WarningListeners.java | 376 ---------------------
.../org/apache/sis/util/logging/package-info.java | 2 +-
.../apache/sis/test/suite/UtilityTestSuite.java | 1 -
.../sis/util/logging/WarningListenersTest.java | 118 -------
.../apache/sis/index/tree}/LatLonPointRadius.java | 61 +---
.../java/org/apache/sis/index/tree/QuadTree.java | 1 -
.../sis/internal/storage/io/ChannelFactory.java | 8 +-
.../java/org/apache/sis/storage/DataStore.java | 52 ---
.../apache/sis/storage/event/StoreListeners.java | 68 +---
.../org/apache/sis/storage/event/package-info.java | 2 +-
.../internal/storage/xml/stream/StaxDataStore.java | 2 +-
63 files changed, 192 insertions(+), 1926 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
index adb42eb,57cb0d0..4246ac1
--- 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
@@@ -1413,16 -1403,10 +1413,16 @@@ public class DefaultMetadata extends IS
/**
* Sets information about the distributor of and options for obtaining the resource(s).
*
- * @param newValues the new distribution info.
+ * <div class="warning"><b>Upcoming API change — multiplicity</b><br>
+ * As of ISO 19115:2014, this singleton has been replaced by a collection.
+ * This change will tentatively be applied in GeoAPI 4.0.
+ * </div>
+ *
+ * @param newValue the new distribution info.
*/
- public void setDistributionInfo(final Collection<? extends Distribution> newValues) {
- distributionInfo = writeCollection(newValues, distributionInfo, Distribution.class);
+ public void setDistributionInfo(final Distribution newValue) {
- checkWritePermission();
++ checkWritePermission(distributionInfo);
+ distributionInfo = newValue;
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
index efdb4ae,041df02..932a78b
--- 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
@@@ -489,16 -474,10 +489,16 @@@ public class DefaultCitation extends IS
/**
* Sets other information required to complete the citation that is not recorded elsewhere.
*
- * @param newValues Other citations details.
+ * <div class="warning"><b>Upcoming API change — multiplicity</b><br>
+ * As of ISO 19115:2014, this singleton has been replaced by a collection.
+ * This change may be applied in GeoAPI 4.0.
+ * </div>
+ *
+ * @param newValue Other citations details, or {@code null} if none.
*/
- public void setOtherCitationDetails(final Collection<? extends InternationalString> newValues) {
- otherCitationDetails = writeCollection(newValues, otherCitationDetails, InternationalString.class);
+ public void setOtherCitationDetails(final InternationalString newValue) {
- checkWritePermission();
++ checkWritePermission(otherCitationDetails);
+ otherCitationDetails = newValue;
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
index aaf1c89,e3c7d70..412b7ef
--- 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
@@@ -416,16 -411,10 +416,16 @@@ public class DefaultContact extends ISO
/**
* Sets time period (including time zone) when individuals can contact the organization or individual.
*
- * @param newValues the new hours of service.
+ * <div class="warning"><b>Upcoming API change — multiplicity</b><br>
+ * As of ISO 19115:2014, this singleton has been replaced by a collection.
+ * This change will tentatively be applied in GeoAPI 4.0.
+ * </div>
+ *
+ * @param newValue the new hours of service.
*/
- public void setHoursOfService(final Collection<? extends InternationalString> newValues) {
- hoursOfService = writeCollection(newValues, hoursOfService, InternationalString.class);
+ public void setHoursOfService(final InternationalString newValue) {
- checkWritePermission();
++ checkWritePermission(hoursOfService);
+ hoursOfService = newValue;
}
/**