This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 161c52e539145524ccc81992879d9241e0438dd8
Merge: d214faa29b 2730c89d63
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Oct 5 15:41:28 2023 +0200
Merge branch 'geoapi-3.1'
.../apache/sis/buildtools/gradle/BuildHelper.java | 1 +
.../apache/sis/buildtools/gradle/Dependency.java | 2 +-
.../apache/sis/buildtools/gradle/ModularJAR.java | 9 +-
.../sis/buildtools/gradle/ModularSources.java | 147 +++++++++++++++++++++
.../apache/sis/buildtools/gradle/ZipWriter.java | 2 +-
endorsed/build.gradle.kts | 109 ++++++++++++---
.../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 +
.../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 +
.../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 +
.../main/org/apache/sis/util/iso/Types.java | 5 +-
.../bind/metadata/replace/QualityParameter.java | 6 +-
.../sis/referencing/AbstractIdentifiedObject.java | 4 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +-
.../org/apache/sis/storage/gpx/WritableStore.java | 1 -
.../org/apache/sis/storage/StorageConnector.java | 2 +
.../org/apache/sis/storage/WritableFeatureSet.java | 1 -
.../org/apache/sis/converter/NumberConverter.java | 2 +
.../org/apache/sis/converter/ObjectToString.java | 4 +
.../org/apache/sis/converter/StringConverter.java | 4 +
.../sis/util/collection/WeakValueHashMap.java | 2 +-
.../apache/sis/util/internal/MetadataServices.java | 2 -
incubator/build.gradle.kts | 10 +-
optional/build.gradle.kts | 13 +-
.../org/apache/sis/gui/map/ValuesFormatter.java | 2 +-
24 files changed, 298 insertions(+), 40 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
index c74f3dfd1d,def4612fa5..336458e1ba
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java
@@@ -94,11 -97,10 +94,9 @@@ public final class QualityParameter ext
/**
* Description of the data quality parameter.
- *
- * @see #getDescription()
*/
@XmlElement
- @SuppressWarnings("serial") // Most Apache SIS
implementations are serializable.
- public Description description;
+ public DefaultMeasureDescription description;
/**
* Value type of the data quality parameter (shall be one of the data
types defined in ISO/TS 19103:2005).
@@@ -204,6 -229,11 +202,8 @@@
* <li>Otherwise the given class is used as if it was already a
component type (i.e. a singleton item).</li>
* </ul>
*
- * This method is used for mapping {@link Class} to ({@link
ValueStructure}, {@link TypeName}) pair.
- * The other member of the pair is given by {@link
ValueStructure#valueOf(Class)}.
- *
+ * @todo {@code Coverage} case needs to be added. It would be handle like
{@link Matrix}.
+ *
* @param valueClass the type of values for which to infer a {@link
TypeName} instance.
* @return a type name for components of the given type.
*/
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index ad235c995f,95c4401371..d979184f3f
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@@ -129,9 -129,9 +129,9 @@@ import org.apache.sis.xml.XML
* <td>{@link Identifier} (optionally as array)</td>
* <td>{@link AbstractIdentifiedObject#getIdentifiers()}</td>
* </tr><tr>
- * <td>{@value org.opengis.referencing.IdentifiedObject#DOMAINS_KEY}</td>
- * <td>{@link org.opengis.referencing.ObjectDomain} (optionally as
array)</td>
+ * <td>"domains"</td>
+ * <td>{@link org.apache.sis.referencing.DefaultObjectDomain} (optionally
as array)</td>
- * <td>{@link #getDomains()}</td>
+ * <td>{@link AbstractIdentifiedObject#getDomains()}</td>
* </tr><tr>
* <td>{@value
org.opengis.referencing.ReferenceSystem#DOMAIN_OF_VALIDITY_KEY}</td>
* <td>{@link Extent}</td>
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
index 247a31c171,06ce25d8d4..ee46e96473
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
@@@ -81,10 -81,9 +81,9 @@@ public interface WritableFeatureSet ext
* Removes all feature instances from this {@code FeatureSet} which
matches the given predicate.
*
* @param filter a predicate which returns {@code true} for feature
instances to be removed.
- * @return {@code true} if any elements were removed.
* @throws DataStoreException if an error occurred while removing
features.
*/
- void removeIf(Predicate<? super Feature> filter) throws
DataStoreException;
+ void removeIf(Predicate<? super AbstractFeature> filter) throws
DataStoreException;
/**
* Updates all feature instances from this {@code FeatureSet} which match
the given predicate.
diff --cc incubator/build.gradle.kts
index d79d25e41a,205eb2fe6f..69d1a6fe8c
--- a/incubator/build.gradle.kts
+++ b/incubator/build.gradle.kts
@@@ -111,10 -114,25 +111,13 @@@ tasks.test
*/
publishing {
publications {
- create<MavenPublication>("cql") {
- var module = "org.apache.sis.cql"
- groupId = "org.apache.sis.core"
- artifactId = "sis-cql"
- artifact(layout.buildDirectory.file("libs/${module}.jar"))
-
artifact(layout.buildDirectory.file("docs/${module}-sources.jar")) {classifier
= "sources"}
-
artifact(layout.buildDirectory.file("docs/${module}-javadoc.jar")) {classifier
= "javadoc"}
- pom {
- name = "Apache SIS CQL"
- description = "CQL parser."
- }
- }
create<MavenPublication>("storage.shapefile") {
+ var module = "org.apache.sis.storage.shapefile"
groupId = "org.apache.sis.storage"
artifactId = "sis-shapefile"
-
artifact(layout.buildDirectory.file("libs/org.apache.sis.storage.shapefile.jar"))
+ artifact(layout.buildDirectory.file("libs/${module}.jar"))
+
artifact(layout.buildDirectory.file("docs/${module}-sources.jar")) {classifier
= "sources"}
+
artifact(layout.buildDirectory.file("docs/${module}-javadoc.jar")) {classifier
= "javadoc"}
pom {
name = "Apache SIS Shapefile storage"
description = "Read and write files in the Shapefile format."
