This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit f4ad53d6574929f763ba5c3831377a13a02547f1 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Jul 17 21:23:41 2026 +0200 Documentation, minor formatting, suppression of a warning. --- .../test/org/apache/sis/console/HelpCommandTest.java | 1 + .../main/org/apache/sis/metadata/CacheKey.java | 2 +- .../referencing/operation/transform/PassThroughTransform.java | 6 ++---- .../sis/referencing/operation/transform/TransformJoiner.java | 11 ++++++----- .../main/org/apache/sis/storage/aggregate/JoinFeatureSet.java | 7 +++++-- .../main/org/apache/sis/storage/aggregate/package-info.java | 2 +- .../main/org/apache/sis/math/Statistics.java | 3 +++ 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/HelpCommandTest.java b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/HelpCommandTest.java index efb28627ef..edc7af6e16 100644 --- a/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/HelpCommandTest.java +++ b/endorsed/src/org.apache.sis.console/test/org/apache/sis/console/HelpCommandTest.java @@ -29,6 +29,7 @@ import org.apache.sis.test.TestCase; * * @author Martin Desruisseaux (Geomatys) */ +@SuppressWarnings("exports") public final class HelpCommandTest extends TestCase { /** * Creates a new test case. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/CacheKey.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/CacheKey.java index 87b3c705e7..9137c767aa 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/CacheKey.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/CacheKey.java @@ -46,7 +46,7 @@ final class CacheKey { /** * Creates a new key to use in the cache. - * The {@code propertyType.isInstance(metadata)} condition should always be {@code true}, + * The {@code propertyType.isAssignableFrom(type)} condition should always be {@code true}, * but this is not verified by this constructor. Instead, the validity can be verified * after constructor with {@link #isValid()}. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java index bacccd1442..73ae473f85 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java @@ -70,7 +70,7 @@ import org.opengis.coordinate.MismatchedDimensionException; * Serialization should be used only for short term storage or RMI between applications running the same SIS version. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.4 + * @version 1.7 * * @see MathTransforms#passThrough(int, MathTransform, int) * @see MathTransforms#compound(MathTransform...) @@ -779,6 +779,7 @@ public class PassThroughTransform extends AbstractMathTransform implements Seria * <li>If the other transform is also a {@code PassThroughTransform}, * then the two transforms may be merged in a single {@code PassThroughTransform} instance.</li> * <li>If the other transform discards some dimensions, verify if we still need a {@code PassThroughTransform}.</li> + * <li>Eventually move affine transform inside or outside the pass-through transform if it can simplify the chain.</li> * </ul> * * @param context information about the neighbor transforms, and the object where to set the result. @@ -845,9 +846,6 @@ public class PassThroughTransform extends AbstractMathTransform implements Seria } } /* - * TODO: replace the remaining code by a call to `TransformJoiner.reduceDimension(…)`. - * But first, we need to verify if this is really equivalent. - * * Verify if matrix discards the sub-transform. If it does not, then we need to keep all the sub-transform * dimensions (discarding them is a "all or nothing" operation). Other dimensions (leading and trailing) * can be keep or discarded on a case-by-case basis. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformJoiner.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformJoiner.java index adb52cca6b..4fc55ee185 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformJoiner.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformJoiner.java @@ -470,14 +470,15 @@ valid: if (i >= 0 && i < steps.size()) { /** * Tries to simplify the transform chain when some coordinates are passed-through the transform at index 0. * A "pass-through" coordinate is an input coordinate which is copied in the output tuple by the transform - * with <em>no change</em> and <em>without using this coordinate value in calculation</em>. In such cases, - * for any {@code MathTransform} that use or modify this coordinate value immediately before or after the - * transform at relative index 0, it does not matter if the order of those operations is modified. + * with <em>no change</em> and <em>without using that coordinate value in calculation</em>. In such cases, + * for any {@code MathTransform} that uses or modifies that coordinate value immediately before or after + * the pass-through transform at relative index 0, it does not matter if the order of those operations is + * modified. * - * <p>{@link AbstractMathTransform#tryConcatenate(TransformJoiner)} Implementations can invoke this method + * <p>{@link AbstractMathTransform#tryConcatenate(TransformJoiner)} implementations can invoke this method * with a map containing the zero-based indexes of the dimensions that are passed-through by the transform * on which {@code tryConcatenate(…)} has been invoked. Each map key is the index of a pass-through coordinate - * in source tuples, while the associated map value is the index for the same coordinate but in target tuples. + * in source tuples. Each associated map value is the index for the same coordinate but in target tuples. * In the common case where the transform does not change the coordinate order, * the keys and the values are the same numbers.</p> * diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java index 9837755c4e..7d14234d25 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java @@ -70,7 +70,7 @@ import org.opengis.filter.BinaryComparisonOperator; * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.6 + * @version 1.7 * @since 1.0 */ public class JoinFeatureSet extends AggregatedFeatureSet { @@ -176,6 +176,8 @@ public class JoinFeatureSet extends AggregatedFeatureSet { * The join condition in the form <var>property from left feature</var> = <var>property from right feature</var>. * This condition specifies also if the comparison is {@linkplain BinaryComparisonOperator#isMatchingCase() case * sensitive} and {@linkplain BinaryComparisonOperator#getMatchAction() how to compare multi-values}. + * + * @since 2.0 (temporary version number until this branch is released) */ public final BinaryComparisonOperator<Feature> condition; @@ -210,7 +212,8 @@ public class JoinFeatureSet extends AggregatedFeatureSet { public JoinFeatureSet(final Resource parent, final FeatureSet left, String leftAlias, final FeatureSet right, String rightAlias, - final Type joinType, final BinaryComparisonOperator<Feature> condition, + final Type joinType, + final BinaryComparisonOperator<Feature> condition, Map<String,?> featureInfo) throws DataStoreException { diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java index fa46716426..86340d39db 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java @@ -22,7 +22,7 @@ * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.6 + * @version 1.7 * @since 1.3 */ package org.apache.sis.storage.aggregate; diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java index 6cb292ca30..40e6ef8ee3 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java @@ -90,6 +90,7 @@ import org.apache.sis.util.internal.shared.DoubleDouble; * @version 1.4 * @since 0.3 */ +@SuppressWarnings("overloads") // Ambiguous `andThen(…)`, but the two variants do the same work. public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Serializable { /** * Serial number for compatibility with different versions. @@ -597,6 +598,8 @@ public class Statistics implements DoubleConsumer, LongConsumer, Cloneable, Seri /** * Returns a hash code value for this statistics. + * + * @return hash code for this statistics. */ @Override public int hashCode() {
