[sis] 01/01: Merge branch 'geoapi-3.1'
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 9a6f339273ceaf48ae1c6431e7c1eaa4b9219fd2
Merge: 01f8dc22a9 a1f4b15161
Author: Martin Desruisseaux
AuthorDate: Fri Sep 29 17:29:50 2023 +0200
Merge branch 'geoapi-3.1'
.../sis/buildtools/coding/ReorganizeImports.java | 105 -
.../apache/sis/buildtools/gradle/Assembler.java| 2 +-
.../apache/sis/buildtools/gradle/Conventions.java | 17 ++-
.../apache/sis/buildtools/gradle/JavaMaker.java| 3 +-
.../sis/buildtools/gradle/ModularCompilation.java | 26 +---
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +-
endorsed/build.gradle.kts | 8 +-
.../main/org/apache/sis/feature/README.md | 77 ++
.../main/org/apache/sis/feature/benchmarks.html| 114 --
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../main/org/apache/sis/xml/README.md | 78 ++
.../sis/xml/bind/gco/ObjectIdentification.html | 59
.../sis/xml/bind/gco/ObjectIdentification.md | 31
.../main/org/apache/sis/xml/readme.html| 98
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/internal/AxisDirectionsTest.md| 3 +
.../sis/metadata/internal/AxisDirectionsTest.txt | 3 -
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java| 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 7 +-
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../src/org.apache.sis.openoffice/bundle/README.md | 100
.../bundle/build-instruction.html | 119 ---
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java| 2 +-
.../apache/sis/parameter/AbstractParameterValue.md | 5 +
.../sis/parameter/AbstractParameterValue.txt | 5 -
.../sis/referencing/factory/sql/EPSG_README.md | 7 +
.../sis/referencing/factory/sql/EPSG_README.txt| 7 -
.../sis/referencing/operation/builder/README.md| 33
.../sis/referencing/operation/builder/readme.html | 50 --
...c3DtoVertical.txt => Geographic3DtoVertical.md} | 6 +-
.../transform/SpecializableTransform1D.md | 3 +
.../transform/SpecializableTransform1D.txt
[sis] branch main updated (01f8dc22a9 -> 9a6f339273)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 01f8dc22a9 Merge branch 'geoapi-3.1'.
add 9e623647ab Tune the rule for ordering import statements. Those changes
were used in the previous commit.
add 1305b01fc8 Avoid using a method which has been deprecated in Gradle
8.3.
add 2f6a07007c Convert text files and HTML files to Markdown format when
those files were not used for tests. The intend is to have a less formats for
documentation (Javadoc, Markdown, MathML), so all `*.txt` files can be
considered as used in tests.
add f07143ab6b fix(FeatureQuery): fix a case where query projection
returned the wrong property name
add 882b254663 Modification of the fix about the property name of a link.
The check for instance of `ValueReference` should be merged with the existing
check done 20 lines below.
add 66ca33f853 Move some tests closer to the place where they are used.
add a1f4b15161 Merge branch 'geoapi-4.0' into geoapi-3.1
new 9a6f339273 Merge branch 'geoapi-3.1'
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/buildtools/coding/ReorganizeImports.java | 105 -
.../apache/sis/buildtools/gradle/Assembler.java| 2 +-
.../apache/sis/buildtools/gradle/Conventions.java | 17 ++-
.../apache/sis/buildtools/gradle/JavaMaker.java| 3 +-
.../sis/buildtools/gradle/ModularCompilation.java | 26 +---
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +-
endorsed/build.gradle.kts | 8 +-
.../main/org/apache/sis/feature/README.md | 77 ++
.../main/org/apache/sis/feature/benchmarks.html| 114 --
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../main/org/apache/sis/xml/README.md | 78 ++
.../sis/xml/bind/gco/ObjectIdentification.html | 59
.../sis/xml/bind/gco/ObjectIdentification.md | 31
.../main/org/apache/sis/xml/readme.html| 98
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/internal/AxisDirectionsTest.md| 3 +
.../sis/metadata/internal/AxisDirectionsTest.txt | 3 -
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java|
[sis] branch geoapi-3.1 updated (80a27652f1 -> a1f4b15161)
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 80a27652f1 Merge branch 'geoapi-4.0' into geoapi-3.1 (imports
reordering).
add 9e623647ab Tune the rule for ordering import statements. Those changes
were used in the previous commit.
add 1305b01fc8 Avoid using a method which has been deprecated in Gradle
8.3.
add 2f6a07007c Convert text files and HTML files to Markdown format when
those files were not used for tests. The intend is to have a less formats for
documentation (Javadoc, Markdown, MathML), so all `*.txt` files can be
considered as used in tests.
add f07143ab6b fix(FeatureQuery): fix a case where query projection
returned the wrong property name
add 882b254663 Modification of the fix about the property name of a link.
The check for instance of `ValueReference` should be merged with the existing
check done 20 lines below.
add 66ca33f853 Move some tests closer to the place where they are used.
new a1f4b15161 Merge branch 'geoapi-4.0' into geoapi-3.1
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/buildtools/coding/ReorganizeImports.java | 105 -
.../apache/sis/buildtools/gradle/Assembler.java| 2 +-
.../apache/sis/buildtools/gradle/Conventions.java | 17 ++-
.../apache/sis/buildtools/gradle/JavaMaker.java| 3 +-
.../sis/buildtools/gradle/ModularCompilation.java | 26 +---
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +-
endorsed/build.gradle.kts | 8 +-
.../main/org/apache/sis/feature/README.md | 77 ++
.../main/org/apache/sis/feature/benchmarks.html| 114 --
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../main/org/apache/sis/xml/README.md | 78 ++
.../sis/xml/bind/gco/ObjectIdentification.html | 59
.../sis/xml/bind/gco/ObjectIdentification.md | 31
.../main/org/apache/sis/xml/readme.html| 98
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/internal/AxisDirectionsTest.md| 3 +
.../sis/metadata/internal/AxisDirectionsTest.txt | 3 -
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 a1f4b15161f53dcde29d134f04a3175b0502e679
Merge: 80a27652f1 66ca33f853
Author: Martin Desruisseaux
AuthorDate: Fri Sep 29 17:20:44 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../sis/buildtools/coding/ReorganizeImports.java | 105 -
.../apache/sis/buildtools/gradle/Assembler.java| 2 +-
.../apache/sis/buildtools/gradle/Conventions.java | 17 ++-
.../apache/sis/buildtools/gradle/JavaMaker.java| 3 +-
.../sis/buildtools/gradle/ModularCompilation.java | 26 +---
.../apache/sis/buildtools/gradle/ModularJAR.java | 4 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 4 +-
endorsed/build.gradle.kts | 8 +-
.../main/org/apache/sis/feature/README.md | 77 ++
.../main/org/apache/sis/feature/benchmarks.html| 114 --
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../main/org/apache/sis/xml/README.md | 78 ++
.../sis/xml/bind/gco/ObjectIdentification.html | 59
.../sis/xml/bind/gco/ObjectIdentification.md | 31
.../main/org/apache/sis/xml/readme.html| 98
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/internal/AxisDirectionsTest.md| 3 +
.../sis/metadata/internal/AxisDirectionsTest.txt | 3 -
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java| 2 +-
.../{test/xml => xml/test}/PackageVerifier.java| 2 +-
.../{test/xml => xml/test}/SchemaCompliance.java | 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 8 +-
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../src/org.apache.sis.openoffice/bundle/README.md | 100
.../bundle/build-instruction.html | 119 ---
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java| 2 +-
.../apache/sis/parameter/AbstractParameterValue.md | 5 +
.../sis/parameter/AbstractParameterValue.txt | 5 -
.../sis/referencing/factory/sql/EPSG_README.md | 7 +
.../sis/referencing/factory/sql/EPSG_README.txt| 7 -
.../sis/referencing/operation/builder/README.md| 33
[sis] 01/02: Modification of the fix about the property name of a link. The check for instance of `ValueReference` should be merged with the existing check done 20 lines below.
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 882b2546639adb474a17795b70d9cea4bdf0f517
Author: Martin Desruisseaux
AuthorDate: Fri Sep 29 15:55:31 2023 +0200
Modification of the fix about the property name of a link.
The check for instance of `ValueReference` should be merged with the
existing check done 20 lines below.
---
.../main/org/apache/sis/storage/FeatureQuery.java | 42 ---
.../org/apache/sis/storage/FeatureQueryTest.java | 60 +++---
2 files changed, 61 insertions(+), 41 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
index d0d8f9c218..172b87705a 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
@@ -738,7 +738,7 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
final NamedExpression item = projection[column];
/*
* For each property, get the expected type (mandatory) and its
name (optional).
- * A default name will be computed if no alias were explicitly
given by user.
+ * A default name will be computed if no alias was explicitly
given by the user.
*/
final Expression expression = item.expression;
final FeatureExpression fex =
FeatureExpression.castOrCopy(expression);
@@ -748,14 +748,6 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
expression.getFunctionName().toInternationalString(), column));
}
GenericName name = item.alias;
-if (name == null && expression instanceof ValueReference) {
-/*
- * If we do not have an alias, use the original property name.
- * This name may be different from the resultType name because
of links or functions.
- */
-name = valueType.getProperty(((ValueReference)
expression).getXPath()).getName();
-}
-
if (name == null) {
/*
* Build a list of aliases declared by the user, for making
sure that we do not collide with them.
@@ -777,14 +769,20 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
*/
CharSequence text = null;
if (expression instanceof ValueReference) {
-final GenericName current = resultType.getName();
-if (current != null && names.add(current.toString())) {
-continue;
-}
String xpath = ((ValueReference)
expression).getXPath().trim();
-xpath = xpath.substring(xpath.lastIndexOf(XPath.SEPARATOR)
+ 1); // Works also if '/' is not found.
-if (!(xpath.isEmpty() || names.contains(xpath))) {
-text = xpath;
+/*
+ * Before to take the tip, take the existing `GenericName`
instance from the property.
+ * It should be equivalent, except that it may be a
`ScopedName` instead of `LocalName`.
+ * We do not take `resultType.getName()` because the
latter is different if the property
+ * is itself a link to another property (in which case
`resultType` is the final target).
+ */
+name = valueType.getProperty(xpath).getName();
+if (name == null || !names.add(name.toString())) {
+name = null;
+xpath =
xpath.substring(xpath.lastIndexOf(XPath.SEPARATOR) + 1); // Works also if '/'
is not found.
+if (!(xpath.isEmpty() || names.contains(xpath))) {
+text = xpath;
+}
}
}
/*
@@ -793,15 +791,15 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
* (for easier programmatic use) because `GenericName`
implementation is designed for
* providing localized names only if explicitly requested.
*/
-if (text == null) do {
-text =
Vocabulary.formatInternational(Vocabulary.Keys.Unnamed_1, ++unnamedNumber);
-} while (!names.add(text.toString()));
-name = Names.createLocalName(null, null, text);
+if (name == null) {
+if (text == null) do {
+text =
[sis] 02/02: Move some tests closer to the place where they are used.
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 66ca33f85325d8a97faba0bdfd10ba33fe5a053a
Author: Martin Desruisseaux
AuthorDate: Fri Sep 29 15:57:14 2023 +0200
Move some tests closer to the place where they are used.
---
endorsed/build.gradle.kts | 8 ++
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29 --
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java| 2 +-
.../{test/xml => xml/test}/PackageVerifier.java| 2 +-
.../{test/xml => xml/test}/SchemaCompliance.java | 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 8 +++---
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java| 2 +-
.../sis/parameter/ParameterMarshallingTest.java| 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 2 +-
.../referencing/crs/DefaultCompoundCRSTest.java| 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeodeticCRSTest.java| 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 2 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java| 2 +-
.../datum/DefaultGeodeticDatumTest.java| 2 +-
.../datum/DefaultPrimeMeridianTest.java| 2 +-
.../datum/DefaultTemporalDatumTest.java| 2 +-
.../datum/DefaultVerticalDatumTest.java| 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 +--
.../referencing/factory/sql/EPSGInstallerTest.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../operation/DefaultPassThroughOperationTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 4 +--
.../sis/test/integration/MetadataVerticalTest.java | 2 +-
.../CC_GeneralOperationParameterTest.java | 2 +-
.../CC_OperationParameterGroupTest.java
[sis] branch geoapi-4.0 updated (f07143ab6b -> 66ca33f853)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from f07143ab6b fix(FeatureQuery): fix a case where query projection
returned the wrong property name
new 882b254663 Modification of the fix about the property name of a link.
The check for instance of `ValueReference` should be merged with the existing
check done 20 lines below.
new 66ca33f853 Move some tests closer to the place where they are used.
The 2 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:
endorsed/build.gradle.kts | 8 +--
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java| 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java| 2 +-
.../constraint/DefaultLegalConstraintsTest.java| 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java| 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java| 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29 ---
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java| 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java| 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java| 2 +-
.../{test/xml => xml/test}/PackageVerifier.java| 2 +-
.../{test/xml => xml/test}/SchemaCompliance.java | 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 8 +--
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java| 2 +-
.../sis/parameter/ParameterMarshallingTest.java| 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 2 +-
.../referencing/crs/DefaultCompoundCRSTest.java| 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeodeticCRSTest.java| 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 2 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java| 2 +-
.../datum/DefaultGeodeticDatumTest.java| 2 +-
.../datum/DefaultPrimeMeridianTest.java| 2 +-
.../datum/DefaultTemporalDatumTest.java| 2 +-
.../datum/DefaultVerticalDatumTest.java| 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 +-
.../referencing/factory/sql/EPSGInstallerTest.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java
[sis] branch geoapi-4.0 updated: fix(FeatureQuery): fix a case where query projection returned the wrong property name
This is an automated email from the ASF dual-hosted git repository.
jsorel pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new f07143ab6b fix(FeatureQuery): fix a case where query projection
returned the wrong property name
f07143ab6b is described below
commit f07143ab6be64f69e027040c35287fd1786ff69c
Author: jsorel
AuthorDate: Fri Sep 29 10:57:22 2023 +0200
fix(FeatureQuery): fix a case where query projection returned the wrong
property name
---
.../main/org/apache/sis/storage/FeatureQuery.java | 8 +++
.../org/apache/sis/storage/FeatureQueryTest.java | 27 ++
2 files changed, 35 insertions(+)
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
index 36ab2fcb16..d0d8f9c218 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java
@@ -748,6 +748,14 @@ public class FeatureQuery extends Query implements
Cloneable, Serializable {
expression.getFunctionName().toInternationalString(), column));
}
GenericName name = item.alias;
+if (name == null && expression instanceof ValueReference) {
+/*
+ * If we do not have an alias, use the original property name.
+ * This name may be different from the resultType name because
of links or functions.
+ */
+name = valueType.getProperty(((ValueReference)
expression).getXPath()).getName();
+}
+
if (name == null) {
/*
* Build a list of aliases declared by the user, for making
sure that we do not collide with them.
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
index f28eb32fdf..4dea8a07ca 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.stream.Collectors;
import org.apache.sis.feature.Features;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
+import org.apache.sis.feature.builder.AttributeRole;
+import org.apache.sis.feature.internal.AttributeConvention;
import org.apache.sis.storage.base.MemoryFeatureSet;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.util.iso.Names;
@@ -327,6 +329,31 @@ public final class FeatureQueryTest extends TestCase {
assertEquals("value3", 25, instance.getPropertyValue("value3"));
}
+/**
+ * Tests {@link
FeatureQuery#setProjection(FeatureQuery.NamedExpression...)} on a field
+ * which is a link, ensure the link name is preserved.
+ *
+ * @throws DataStoreException if an error occurred while executing the
query.
+ */
+@Test
+public void testProjectionOfLink() throws DataStoreException {
+
+final FeatureTypeBuilder ftb = new FeatureTypeBuilder();
+ftb.setName("test");
+
ftb.addAttribute(String.class).setName("id").addRole(AttributeRole.IDENTIFIER_COMPONENT);
+FeatureType ft = ftb.build();
+
+Feature feature = ft.newInstance();
+feature.setPropertyValue("id", "id-0");
+
+final FeatureQuery query = new FeatureQuery();
+query.setProjection(AttributeConvention.IDENTIFIER);
+
+final FeatureSet fs = new MemoryFeatureSet(null, ft, List.of(feature));
+Feature r = fs.subset(query).features(true).iterator().next();
+assertEquals("id-0",
r.getPropertyValue(AttributeConvention.IDENTIFIER));
+}
+
/**
* Shortcut for creating expression for a projection computed on-the-fly.
*/
