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
commit f308b11bc89a4c20ef5f09f78383c8e4029b23cf
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed May 3 11:16:33 2023 +0200
Rename `ProjectionType.COMPLETING` ad `COMPUTING`.
---
.../src/main/java/org/apache/sis/storage/FeatureQuery.java | 10 +++++-----
.../src/test/java/org/apache/sis/storage/FeatureQueryTest.java | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
b/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
index 46947ce71e..1d34f86d1d 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureQuery.java
@@ -460,7 +460,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
/*
* The expression is evaluated every times that the property value is
requested.
- * This projection type is similar to {@link #COMPLETING}, except that
the features
+ * This projection type is similar to {@link #COMPUTING}, except that
the features
* given in calls to {@link Expression#apply(Object)} are the same
instances than
* the ones used by {@link #STORED}.
*
@@ -470,7 +470,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
* </div>
*
* <h4>Feature instances in expression evaluation</h4>
- * The combination of deferred calculation (like {@link #COMPLETING})
and usage of feature instances
+ * The combination of deferred calculation (like {@link #COMPUTING})
and usage of feature instances
* from the <em>source</em> {@link FeatureSet} (like {@link #STORED})
may cause this projection type
* to retain the source feature instances for a longer time than other
types.
*
@@ -494,7 +494,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
* The features given in calls to {@link Expression#apply(Object)} are
instances from the <em>target</em>
* {@link FeatureSet}, after filtering. The instances from the source
{@code FeatureSet} are no longer
* available when the expression is executed. Consequently, all fields
that are necessary for computing
- * a {@code COMPLETING} field shall have been first copied in {@link
#STORED} fields.
+ * a {@code COMPUTING} field shall have been first copied in {@link
#STORED} fields.
*
* <div class="note"><b>Note on naming:</b>
* verb tense <i>-ing</i> instead of <i>-ed</i> is for emphasizing
that the data used for computation
@@ -502,7 +502,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
*
* @see FeatureOperations#expression(Map, Function, AttributeType)
*/
- COMPLETING
+ COMPUTING
}
/**
@@ -794,7 +794,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
* We need to keep the property name computed by
`fex.expectedType(…)` for the operation result,
* because that name is the name of the link to create if the
operation is `ValueReference`.
*/
- if (item.type == ProjectionType.COMPLETING && resultType
instanceof AttributeTypeBuilder<?>) {
+ if (item.type == ProjectionType.COMPUTING && resultType instanceof
AttributeTypeBuilder<?>) {
final var ab = (AttributeTypeBuilder<?>) resultType;
final AttributeType<?> storedType = ab.build();
if (ftb.properties().remove(resultType)) {
diff --git
a/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
b/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
index fb70453eb6..32ce1bd5fd 100644
---
a/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
+++
b/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureQueryTest.java
@@ -329,7 +329,7 @@ public final class FeatureQueryTest extends TestCase {
* Shortcut for creating expression for a projection computed on-the-fly.
*/
private static FeatureQuery.NamedExpression virtualProjection(final
Expression<Feature, ?> expression, final String alias) {
- return new FeatureQuery.NamedExpression(expression,
Names.createLocalName(null, null, alias),
FeatureQuery.ProjectionType.COMPLETING);
+ return new FeatureQuery.NamedExpression(expression,
Names.createLocalName(null, null, alias),
FeatureQuery.ProjectionType.COMPUTING);
}
/**
