This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 90b5999bd7855c46707cfee68c567621f3ae02a4
Merge: d9b2863 ddbee3b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 12 20:32:24 2019 +0200
Merge branch 'geoapi-3.1': remove 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 +-
.../iso/identification/AbstractIdentification.java | 2 +-
.../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 | 14 +-
.../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 ---------
.../sis/referencing/AbstractIdentifiedObject.java | 1 -
.../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 -------
.../java/org/apache/sis/internal/netcdf/Axis.java | 2 +-
.../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 +-
66 files changed, 190 insertions(+), 1927 deletions(-)
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
index f9802a1,1fb8556..165dbb5
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Identifiers.java
@@@ -92,11 -91,11 +92,11 @@@ public final class Identifiers extends
* <ul>
* <li>For information purpose (e.g. some {@code toString()} methods),
use {@code getIdentifier(…, false)}.</li>
* <li>For WKT formatting, use {@code getIdentifier(…, true)} in order
to preserve formatting characters.</li>
- * <li>For assigning a value to a {@code codeSpace} field, use {@link
Citations#getUnicodeIdentifier(Citation)}.</li>
+ * <li>For assigning a value to a {@code codeSpace} field, use {@link
Citations#toCodeSpace(Citation)}.</li>
* </ul>
*
- * Use {@code getUnicodeIdentifier(…)} method when assigning values to be
returned by methods like
+ * Use {@code toCodeSpace(…)} method when assigning values to be returned
by methods like
- * {@link Identifier#getCodeSpace()}, since those values are likely to be
compared without special
+ * {@link ReferenceIdentifier#getCodeSpace()}, since those values are
likely to be compared without special
* care about ignorable identifier characters. But if the intent is to
format a more complex string
* like WKT or {@code toString()}, then we suggest to use {@code
getIdentifier(citation, true)} instead,
* which will produce the same result but preserving the ignorable
characters, which can be useful
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
index c1ca0ca,6a83995..c1e3b1b
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
@@@ -25,8 -25,6 +25,7 @@@ import java.util.Locale
import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
- import org.opengis.referencing.IdentifiedObject; // For javadoc
+import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.util.Static;
import org.apache.sis.util.Characters;
import org.apache.sis.util.CharSequences;
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
index 018c09a,9a24099..81b8017
---
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
@@@ -813,20 -819,7 +813,20 @@@ public class AbstractIdentification ext
*/
@Deprecated
public void setAggregationInfo(final Collection<? extends
AggregateInformation> newValues) {
- checkWritePermission();
- setAssociatedResources(newValues);
++ checkWritePermission(associatedResources);
+ /*
+ * We can not invoke getAggregationInfo().setValues(newValues)
because this method
+ * is invoked by the constructor, which is itself invoked at JAXB
marshalling time,
+ * in which case getAggregationInfo() may return null.
+ */
+ List<DefaultAssociatedResource> r = null;
+ if (newValues != null) {
+ r = new ArrayList<DefaultAssociatedResource>(newValues.size());
+ for (final AggregateInformation value : newValues) {
+ r.add(DefaultAssociatedResource.castOrCopy(value));
+ }
+ }
+ setAssociatedResources(r);
}
diff --cc
core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
index ab16cf6,3990f1b..3adc5d6
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
@@@ -21,8 -21,11 +21,9 @@@ import java.util.Map
import java.util.HashSet;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.quality.Completeness;
+ import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.crs.GeographicCRS;
-import org.opengis.coverage.grid.RectifiedGrid;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.acquisition.DefaultPlatform;
diff --cc
core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index 9f71cd8,5ca0cd2..d2f1813
---
a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++
b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@@ -194,13 -197,18 +195,16 @@@ final class FinalLocationType extends A
/**
* Returns an unmodifiable copy of the given metadata, if necessary and
possible.
+ *
- * @param <T> compile-time value of the {@code type} argument.
- * @param type the interface of the metadata object to eventually
copy.
+ * @param metadata the metadata object to eventually copy, or {@code
null}.
+ * @return an unmodifiable copy of the given metadata object, or {@code
null} if the given argument is {@code null}.
*/
- private static Object unmodifiable(final Object metadata) {
- private static <T> T unmodifiable(final Class<T> type, T metadata) {
++ private static Object unmodifiable(Object metadata) {
if (metadata instanceof ModifiableMetadata) {
- return ((ModifiableMetadata) metadata).unmodifiable();
- } else {
- return metadata;
- metadata = MetadataCopier.forModifiable(((ModifiableMetadata)
metadata).getStandard()).copy(type, metadata);
++ metadata = MetadataCopier.forModifiable(((ModifiableMetadata)
metadata).getStandard()).copy(metadata);
+ ((ModifiableMetadata)
metadata).transition(ModifiableMetadata.State.FINAL);
}
+ return metadata;
}
/**
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 3ae3f31,18afaa7..f284b9f
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -69,8 -69,6 +69,7 @@@ import static org.apache.sis.internal.u
// Branch-dependent imports
import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.metadata.iso.DefaultIdentifier;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
/**
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
index e067eb6,a004719..f8f75d3
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
@@@ -27,9 -27,8 +27,8 @@@ import javax.xml.bind.annotation.XmlEle
import javax.xml.bind.annotation.XmlRootElement;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
-import org.opengis.metadata.Identifier;
import org.opengis.referencing.datum.Ellipsoid;
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.internal.util.Numerics;
import org.apache.sis.internal.util.DoubleDouble;
import org.apache.sis.internal.jaxb.gml.Measure;
diff --cc
storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
index 4119d6a,5be89ad..25c99fb
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
@@@ -531,7 -531,7 +531,7 @@@ public final class Axis extends NamedEl
*/
final String alt = coordinates.getAttributeAsString(CDM.LONG_NAME);
if (alt != null && !similar(alt, name)) {
-
properties.put(org.apache.sis.metadata.iso.ImmutableIdentifier.DESCRIPTION_KEY,
alt); // Description associated to primary name.
- properties.put(org.opengis.metadata.Identifier.DESCRIPTION_KEY,
alt); // Description associated to primary name.
++
properties.put(org.apache.sis.referencing.ImmutableIdentifier.DESCRIPTION_KEY,
alt); // Description associated to primary name.
if (!similar(alt, standardName)) {
aliases.add(new NamedIdentifier(null, alt));
// Additional alias.
}
