(sis) branch main updated (65771ca1ee -> d98b7a3e07)
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 65771ca1ee Merge branch 'geoapi-3.1': automatic post-merge import reorganization. add 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`. add e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is unknown (we cannot reproduce this test failure locally). add 9696bd8bfe Merge branch 'geoapi-4.0' into geoapi-3.1. new d98b7a3e07 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 | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 4 +-- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 16 files changed, 64 insertions(+), 58 deletions(-)
(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 d98b7a3e07c67d1fa6c8367c6cb7117c750e42c2
Merge: 65771ca1ee 9696bd8bfe
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 17:11:48 2024 +0200
Merge branch 'geoapi-3.1'.
.../sis/buildtools/coding/ReorganizeImports.java | 11 +++-
.../apache/sis/metadata/ModifiableMetadata.java| 11 ++--
.../apache/sis/metadata/iso/extent/Extents.java| 4 +--
.../iso/quality/AbstractTemporalQuality.java | 1 -
...DefaultNonQuantitativeAttributeCorrectness.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java| 6 +++--
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 +-
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 +
.../sis/referencing/EPSGFactoryFallback.java | 15 ++-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++-
.../sis/util/DefaultInternationalString.java | 30 --
.../main/org/apache/sis/util/Locales.java | 17 ++--
.../test/org/apache/sis/test/LoggingWatcher.java | 8 --
.../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++---
16 files changed, 64 insertions(+), 58 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
index 318c7d2c5e,72846865a5..f0d9e6d7bc
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/AbstractTemporalQuality.java
@@@ -108,8 -106,7 +108,7 @@@ public class AbstractTemporalQuality ex
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- @SuppressWarnings("deprecation")
-public static AbstractTemporalQuality castOrCopy(final TemporalQuality
object) {
+public static AbstractTemporalQuality castOrCopy(final TemporalAccuracy
object) {
if (object instanceof AccuracyOfATimeMeasurement) {
return
DefaultAccuracyOfATimeMeasurement.castOrCopy((AccuracyOfATimeMeasurement)
object);
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
index 9200bab2c5,0e880847f1..2540a74d36
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeCorrectness.java
@@@ -99,8 -98,10 +99,7 @@@ public class DefaultNonQuantitativeAttr
* @return a SIS implementation containing the values of the given object
(may be the
* given object itself), or {@code null} if the argument was null.
*/
- @SuppressWarnings("deprecation")
-public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final
NonQuantitativeAttributeCorrectness object) {
-if (object instanceof NonQuantitativeAttributeAccuracy) {
-return
DefaultNonQuantitativeAttributeAccuracy.castOrCopy((NonQuantitativeAttributeAccuracy)
object);
-}
+public static DefaultNonQuantitativeAttributeCorrectness castOrCopy(final
NonQuantitativeAttributeAccuracy object) {
if (object == null || object instanceof
DefaultNonQuantitativeAttributeCorrectness) {
return (DefaultNonQuantitativeAttributeCorrectness) object;
}
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4c43f12d45,4ea1c59659..10281bd0bf
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -238,9 -192,10 +239,10 @@@ public class SimpleIdentifiedObject imp
*/
@Override
public String toString() {
+ @SuppressWarnings("LocalVariableHidesMemberVariable")
-final Identifier name = this.name;
++final ReferenceIdentifier name = this.name;
final String code, codespace;
final Citation authority;
- final ReferenceIdentifier name = this.name;
if (name != null) {
code = name.getCode();
codespace = name.getCodeSpace();
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
index ae1f4b6366,0a61396e4d..966e38cdb6
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
+++
(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 9696bd8bfe4ee87cf7432196327aa9ead17ededa Merge: e111cc6c47 e5d010c2e1 Author: Martin Desruisseaux AuthorDate: Tue Apr 9 16:55:33 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../sis/buildtools/coding/ReorganizeImports.java | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 6 ++--- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../referencing/privy/ReferencingUtilities.java| 1 + .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 18 files changed, 68 insertions(+), 60 deletions(-)
(sis) branch geoapi-3.1 updated (e111cc6c47 -> 9696bd8bfe)
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 e111cc6c47 Post-merge automatic import reorganization. add 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`. add e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is unknown (we cannot reproduce this test failure locally). new 9696bd8bfe 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 | 11 +++- .../apache/sis/metadata/ModifiableMetadata.java| 11 ++-- .../apache/sis/metadata/iso/extent/Extents.java| 6 ++--- .../iso/quality/AbstractTemporalQuality.java | 1 - ...DefaultNonQuantitativeAttributeCorrectness.java | 1 - .../metadata/simple/SimpleIdentifiedObject.java| 6 +++-- .../org/apache/sis/xml/PooledUnmarshaller.java | 2 +- .../sis/util/iso/DefaultRecordSchemaTest.java | 2 +- .../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 + .../sis/referencing/EPSGFactoryFallback.java | 15 ++- .../referencing/privy/ReferencingUtilities.java| 1 + .../sis/referencing/crs/DefaultImageCRSTest.java | 2 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++- .../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++- .../sis/util/DefaultInternationalString.java | 30 -- .../main/org/apache/sis/util/Locales.java | 17 ++-- .../test/org/apache/sis/test/LoggingWatcher.java | 8 -- .../org/apache/sis/gui/referencing/CRSChooser.java | 7 ++--- 18 files changed, 68 insertions(+), 60 deletions(-)
(sis) branch geoapi-4.0 updated: Add a safety for parsing a CRS code as an HTTP URL when using the fallback factory. It seems necessary for the tests on the Jenkins server. The reason why the code doe
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new e5d010c2e1 Add a safety for parsing a CRS code as an HTTP URL when
using the fallback factory. It seems necessary for the tests on the Jenkins
server. The reason why the code doesn't go through `MultiAuthoritiesFactory` on
the Jenkins server is unknown (we cannot reproduce this test failure locally).
e5d010c2e1 is described below
commit e5d010c2e165871526b7902352cae0800324485b
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 16:35:56 2024 +0200
Add a safety for parsing a CRS code as an HTTP URL when using the fallback
factory.
It seems necessary for the tests on the Jenkins server. The reason why the
code
doesn't go through `MultiAuthoritiesFactory` on the Jenkins server is
unknown
(we cannot reproduce this test failure locally).
---
.../org/apache/sis/referencing/EPSGFactoryFallback.java | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 38a495452a..d680035673 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@ -279,13 +279,16 @@ final class EPSGFactoryFallback extends
GeodeticAuthorityFactory
private Object predefined(String code, final int kind) throws
NoSuchAuthorityCodeException {
try {
/*
- * Parse the value after the last ':'. We do not bother to verify
if the part before ':' is legal
- * (e.g. "EPSG:4326", "EPSG::4326", "urn:ogc:def:crs:epsg::4326",
etc.) because this analysis has
- * already be done by MultiAuthoritiesFactory. We nevertheless
skip the prefix in case this factory
- * is used directly (not through MultiAuthoritiesFactory), which
should be rare. The main case is
- * when using the factory returned by
AuthorityFactories.fallback(…).
+ * Parse the value after the last ':' for an URN of the form
"urn:ogc:def:crs:epsg::4326",
+ * or after the last '#' for an URL of the form
"http://www.opengis.net/gml/srs/epsg.xml#4326;.
+ * We do not bother to verify if the part before ':' or '#' is
legal because this analysis has
+ * already be done by `MultiAuthoritiesFactory`. The check for
separator should be unnecessary,
+ * but we nevertheless do it because this factory is sometime
invoked directly rather than through
+ * `MultiAuthoritiesFactory`. The direct invocation happens when
`CRS.forCode(String)` fallbacks
+ * on `AuthorityFactories.fallback(…)`.
*/
-code = CharSequences.trimWhitespaces(code,
code.lastIndexOf(Constants.DEFAULT_SEPARATOR) + 1, code.length()).toString();
+final int s =
Math.max(code.lastIndexOf(Constants.DEFAULT_SEPARATOR), code.lastIndexOf('#'));
+code = CharSequences.trimWhitespaces(code, s + 1,
code.length()).toString();
final short n = Short.parseShort(code);
if ((kind & (ELLIPSOID | DATUM | CRS)) != 0) {
for (final CommonCRS crs : CommonCRS.values()) {
(sis) branch geoapi-4.0 updated: Post-merge cleanup: edit documentation, remove unnecessary `@SuppressWarnings`.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 9c72d89383 Post-merge cleanup: edit documentation, remove unnecessary
`@SuppressWarnings`.
9c72d89383 is described below
commit 9c72d893836cfa4586fdc5bb4358bf80911fd82f
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 15:56:25 2024 +0200
Post-merge cleanup: edit documentation, remove unnecessary
`@SuppressWarnings`.
---
.../sis/buildtools/coding/ReorganizeImports.java | 11 +++-
.../apache/sis/metadata/ModifiableMetadata.java| 11 ++--
.../apache/sis/metadata/iso/extent/Extents.java| 6 ++---
.../iso/quality/AbstractTemporalQuality.java | 1 -
...DefaultNonQuantitativeAttributeCorrectness.java | 1 -
.../metadata/simple/SimpleIdentifiedObject.java| 6 +++--
.../org/apache/sis/xml/PooledUnmarshaller.java | 2 +-
.../sis/util/iso/DefaultRecordSchemaTest.java | 2 +-
.../apache/sis/util/iso/DefaultRecordTypeTest.java | 1 +
.../sis/referencing/crs/DefaultEngineeringCRS.java | 1 -
.../sis/referencing/datum/AbstractDatum.java | 1 -
.../org/apache/sis/referencing/datum/SubTypes.java | 1 -
.../referencing/privy/ReferencingUtilities.java| 1 +
.../sis/referencing/GeodeticObjectVerifier.java| 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRS.java | 4 ++-
.../sis/referencing/datum/HardCodedDatum.java | 3 ++-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 3 ++-
.../sis/util/DefaultInternationalString.java | 30 --
.../main/org/apache/sis/util/Locales.java | 17 ++--
.../test/org/apache/sis/test/LoggingWatcher.java | 8 --
.../org/apache/sis/gui/referencing/CRSChooser.java | 9 ---
22 files changed, 63 insertions(+), 60 deletions(-)
diff --git
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
index 33a9d79113..c7e46b9cbd 100644
---
a/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
+++
b/buildSrc/src/main/java/org/apache/sis/buildtools/coding/ReorganizeImports.java
@@ -59,28 +59,25 @@ import java.util.Set;
*
* {@snippet lang="shell" :
* cd geoapi-4.0
+ * git diff
* git add --update
- * git diff --staged
* gradle test
* git diff
* git add --update
- * git commit
+ * git commit --message "Post-merge automatic reorganization of imports
order."
* }
*
* Then temporarily stash the changes in {@code geoapi-3.1}, merge, pop the
stashed changes, test and commit:
*
* {@snippet lang="shell" :
* cd ../geoapi-3.1
+ * git diff
* git add --update
- * git diff --staged
- * git stash --message "Import reordering"
* git merge geoapi-4.0 -s ours --no-commit
- * git stash pop
- * git add --update
* gradle test
* git diff
* git add --update
- * git commit
+ * git commit --message "Merge of automatic reorganization of imports order."
* }
*
* Finally apply the same pattern on the {@code main} branch.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
index 6be665b756..c04139e60f 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
@@ -923,8 +923,15 @@ public abstract class ModifiableMetadata extends
AbstractMetadata {
* is assignable to {@link CodeList}, {@link Enum}, {@link String}, {@link
Charset},
* {@link Locale} or {@link Currency}, and {@linkplain
List}.class otherwise.
* Subclasses can override this method for choosing different kind of
collections.
- * Note however that {@link Set} should be used only with immutable
element types,
- * for {@linkplain Object#hashCode() hash code} stability.
+ *
+ * Constraints
+ * Implementations should comply to the following constraints:
+ *
+ * This method may be invoked (indirectly) at construction
time.
+ *Therefor, the implementation should not depend on the object
state.
+ * The {@link Set} type should be returned only when the set
elements are immutable.
+ *This is needed for {@linkplain Object#hashCode() hash code}
stability.
+ *
*
* @paramthe type of elements in the collection to be
created.
* @param elementType the type of elements in the collection to be
created.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
(sis) 01/01: Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
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 65771ca1eeeb0f988303fb97ba3762b74fe88509
Merge: 3403855d45 e111cc6c47
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 14:40:11 2024 +0200
Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 6 --
.../org/apache/sis/xml/test/AnnotationConsistencyCheck.java| 2 +-
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +-
.../main/org/apache/sis/referencing/Properties.java| 4 ++--
.../main/org/apache/sis/referencing/StandardDefinitions.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 10 ++
.../sis/referencing/operation/InverseOperationMethod.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../apache/sis/referencing/AbstractReferenceSystemTest.java| 4 +++-
.../org/apache/sis/referencing/GeodeticObjectVerifier.java | 8
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++-
.../test/org/apache/sis/test/TestUtilities.java| 8
16 files changed, 39 insertions(+), 27 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 8330dc4683,d75dbdb9db..4c43f12d45
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -30,14 -29,9 +29,15 @@@ import org.apache.sis.util.privy.Consta
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.ReferenceIdentifier;
+// Specific to the main branch:
+import java.util.Set;
+import java.util.Collection;
+import java.util.Collections;
+import org.opengis.util.GenericName;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index 82e971b46f,e189a2e320..7487381abf
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -25,11 -24,15 +24,14 @@@ import org.opengis.referencing.cs.Range
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.datum.VerticalDatumType;
- import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.metadata.extent.Extent;
+ import org.opengis.util.InternationalString;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Optional;
-import org.opengis.referencing.datum.RealizationMethod;
+// Specific to the main branch:
+import java.util.Date;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index bf1888bd5c,798c00d7e8..b72f380f9c
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -88,9 -87,8 +87,10 @@@ import org.apache.sis.util.iso.Types
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.referencing.internal.ServicesForMetadata;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 47e11311f5,7c51395de5..33c3997573
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -77,9 -76,8 +76,10 @@@ import static org.apache.sis.util.privy
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the
(sis) branch main updated (3403855d45 -> 65771ca1ee)
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 3403855d45 Merge branch 'geoapi-3.1'. add ecf5857313 Post-merge automatic import reorganization. add e111cc6c47 Post-merge automatic import reorganization. new 65771ca1ee Merge branch 'geoapi-3.1': automatic post-merge import reorganization. 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: .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java | 6 -- .../org/apache/sis/xml/test/AnnotationConsistencyCheck.java| 2 +- .../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +- .../org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +- .../main/org/apache/sis/referencing/Properties.java| 4 ++-- .../main/org/apache/sis/referencing/StandardDefinitions.java | 2 +- .../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++- .../main/org/apache/sis/referencing/internal/Legacy.java | 10 ++ .../sis/referencing/operation/InverseOperationMethod.java | 2 +- .../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +- .../apache/sis/referencing/AbstractReferenceSystemTest.java| 4 +++- .../org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 .../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++- .../test/org/apache/sis/test/TestUtilities.java| 8 16 files changed, 39 insertions(+), 27 deletions(-)
(sis) branch geoapi-3.1 updated (abe39d4ffc -> e111cc6c47)
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 abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. add ecf5857313 Post-merge automatic import reorganization. new e111cc6c47 Post-merge automatic import reorganization. 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: .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java| 6 -- .../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +- .../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++--- .../main/org/apache/sis/referencing/Properties.java | 4 ++-- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +- .../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8 .../test/org/apache/sis/referencing/CRSTest.java | 6 +++--- .../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 .../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++--- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++--- .../test/org/apache/sis/test/TestUtilities.java | 8 13 files changed, 34 insertions(+), 32 deletions(-)
(sis) 01/01: Post-merge automatic import reorganization.
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 e111cc6c47ef23db83975025c4a7dbbb23bd596b
Merge: abe39d4ffc ecf5857313
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 14:35:16 2024 +0200
Post-merge automatic import reorganization.
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java| 6 --
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 4 ++--
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8
13 files changed, 34 insertions(+), 32 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index bee7ecae16,09e22bcf63..d75dbdb9db
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -29,9 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index e3e3e59eea,93a0221081..e189a2e320
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -25,9 -24,8 +24,12 @@@ import org.opengis.referencing.cs.Range
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.datum.VerticalDatumType;
- import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.metadata.extent.Extent;
++import org.opengis.util.InternationalString;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 2726522a23,289b12216a..5a3d432312
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@@ -33,9 -31,6 +31,11 @@@ import org.apache.sis.util.Deprecable
import org.apache.sis.util.privy.AbstractMap;
import org.apache.sis.referencing.privy.CoordinateOperations;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.referencing.datum.Datum;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 6d95249674,24d4cb655e..2a12ed66a7
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
@@@ -23,8 -22,8 +22,9 @@@ import org.apache.sis.xml.NilObject
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
+// Specific to the main and geoapi-3.1 branches:
++import org.opengis.util.InternationalString;
+import org.opengis.referencing.ReferenceIdentifier;
/**
(sis) branch geoapi-4.0 updated: Post-merge automatic import reorganization.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new ecf5857313 Post-merge automatic import reorganization.
ecf5857313 is described below
commit ecf58573132347e11b9cc910038361b863522e76
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 14:32:27 2024 +0200
Post-merge automatic import reorganization.
---
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8
13 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 85bd4a9132..c9f6cc706c 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -30,7 +30,6 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
-import org.opentest4j.AssertionFailedError;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
import org.opengis.annotation.Specification;
@@ -42,6 +41,7 @@ import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.cat.CodeListUID;
// Test dependencies
+import org.opentest4j.AssertionFailedError;
import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCaseWithLogs;
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 04e97af060..f7cc6fb91d 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -21,15 +21,15 @@ import java.util.HashMap;
import org.apache.sis.metadata.iso.citation.DefaultOrganisation;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
/**
* Tests {@link ReferencingByIdentifiers}.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index b882cec7f4..5ee05e7d77 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -84,13 +84,13 @@ import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
// Specific to the geoapi-4.0 branch:
import org.apache.sis.referencing.crs.DefaultImageCRS;
import org.apache.sis.referencing.datum.DefaultImageDatum;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
/**
* Well Known Text (WKT) parser for referencing objects. This include, but is
not
(sis) branch main updated (129054c2fa -> 3403855d45)
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 129054c2fa Merge automatic import reorganization (for isolating the difference between branches). add cb2e0de6f8 Fix an import order. add 938f77504b Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. add abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. new 3403855d45 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 | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 2 +- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 31 + .../gazetteer/ReferencingByIdentifiersTest.java| 2 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 + .../main/org/apache/sis/referencing/CRS.java | 23 +++--- .../apache/sis/referencing/IdentifiedObjects.java | 51 + .../org/apache/sis/referencing/Properties.java | 3 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +-- .../sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../sis/referencing/datum/BursaWolfParameters.java | 3 ++ .../operation/AbstractCoordinateOperation.java | 5 +-- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 2 +- .../DefaultCoordinateOperationFactory.java | 14 +++--- .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 2 +- .../operation/InverseOperationMethod.java | 6 ++- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 2 +- .../referencing/privy/NilReferencingObject.java| 22 ++--- .../sis/xml/bind/referencing/CS_UserDefinedCS.java | 1 - .../referencing/AbstractReferenceSystemTest.java | 10 +++-- .../sis/referencing/GeodeticObjectVerifier.java| 45 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 15 --- .../datum/DefaultVerticalDatumTest.java| 5 ++- .../sis/referencing/datum/HardCodedDatum.java | 21 +++-- .../operation/SingleOperationMarshallingTest.java | 12 ++--- .../sis/test/integration/MetadataVerticalTest.java | 5 ++- .../apache/sis/storage/base/MetadataBuilder.java | 5 ++- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 52 ++ .../org/apache/sis/gui/referencing/CRSChooser.java | 20 + .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 21 + 45 files changed, 331 insertions(+), 160 deletions(-)
(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 3403855d4538f69120d0adf2829a8187799de9d2
Merge: 129054c2fa abe39d4ffc
Author: Martin Desruisseaux
AuthorDate: Tue Apr 9 13:22:51 2024 +0200
Merge branch 'geoapi-3.1'.
.../sis/buildtools/coding/ReorganizeImports.java | 1 +
.../apache/sis/coverage/grid/GridExtentCRS.java| 2 +-
.../sis/metadata/iso/extent/DefaultExtent.java | 3 +-
.../apache/sis/metadata/iso/extent/Extents.java| 4 ++
.../gazetteer/ModifiableLocationType.java | 2 +-
.../gazetteer/ReferencingByIdentifiers.java| 31 +
.../gazetteer/ReferencingByIdentifiersTest.java| 2 +-
.../main/org/apache/sis/io/wkt/ElementKind.java| 50 +
.../main/org/apache/sis/referencing/CRS.java | 23 +++---
.../apache/sis/referencing/IdentifiedObjects.java | 51 +
.../org/apache/sis/referencing/Properties.java | 3 +-
.../apache/sis/referencing/crs/AbstractCRS.java| 5 +--
.../sis/referencing/crs/DefaultDerivedCRS.java | 2 +-
.../sis/referencing/datum/BursaWolfParameters.java | 3 ++
.../operation/AbstractCoordinateOperation.java | 5 +--
.../operation/AbstractSingleOperation.java | 3 +-
.../operation/CoordinateOperationFinder.java | 3 +-
.../operation/CoordinateOperationSorter.java | 3 +-
.../operation/DefaultConcatenatedOperation.java| 3 +-
.../referencing/operation/DefaultConversion.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 14 +++---
.../operation/DefaultPassThroughOperation.java | 3 +-
.../operation/DefaultTransformation.java | 2 +-
.../operation/InverseOperationMethod.java | 6 ++-
.../operation/transform/MathTransforms.java| 2 +-
.../privy/EllipsoidalHeightCombiner.java | 2 +-
.../referencing/privy/NilReferencingObject.java| 22 ++---
.../sis/xml/bind/referencing/CS_UserDefinedCS.java | 1 -
.../referencing/AbstractReferenceSystemTest.java | 10 +++--
.../sis/referencing/GeodeticObjectVerifier.java| 45 ++-
.../referencing/crs/DefaultGeodeticCRSTest.java| 3 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 3 +-
.../datum/DefaultGeodeticDatumTest.java| 12 +++--
.../datum/DefaultTemporalDatumTest.java| 15 ---
.../datum/DefaultVerticalDatumTest.java| 5 ++-
.../sis/referencing/datum/HardCodedDatum.java | 21 +++--
.../operation/SingleOperationMarshallingTest.java | 12 ++---
.../sis/test/integration/MetadataVerticalTest.java | 5 ++-
.../apache/sis/storage/base/MetadataBuilder.java | 5 ++-
.../main/org/apache/sis/util/ComparisonMode.java | 4 +-
.../org/apache/sis/util/LenientComparable.java | 3 +-
.../test/org/apache/sis/test/TestUtilities.java| 52 ++
.../org/apache/sis/gui/referencing/CRSChooser.java | 20 +
.../gui/referencing/RecentReferenceSystems.java| 2 +-
.../main/org/apache/sis/gui/referencing/Utils.java | 21 +
45 files changed, 331 insertions(+), 160 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
index e11b6372c8,cacfa9b7fa..ae28430fdb
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
@@@ -178,12 -181,12 +178,12 @@@ final class GridExtentCRS
/*
* Put everything together: parameters, conversion and finally the
derived CRS.
*/
- final HashMap properties = new HashMap<>(8);
+ final var properties = new HashMap(8);
properties.put(IdentifiedObject.NAME_KEY, METHOD.getName());
properties.put(DefaultConversion.LOCALE_KEY, locale);
-properties.put(ObjectDomain.SCOPE_KEY, SCOPE);
+properties.put(Conversion.SCOPE_KEY, SCOPE);
gg.getGeographicExtent().ifPresent((domain) -> {
-properties.put(ObjectDomain.DOMAIN_OF_VALIDITY_KEY,
+properties.put(Conversion.DOMAIN_OF_VALIDITY_KEY,
new DefaultExtent(null, domain, null, null));
});
final ParameterValueGroup params =
METHOD.getParameters().createValue();
diff --cc
endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index 7d35fb2f14,0d526a2fd7..b348bd7770
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@@ -133,21 -120,17 +133,17 @@@ public abstract class ReferencingByIden
* Property name
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`.
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 abe39d4ffccdf0e5209169c26bde265bf9e27377 Merge: 72bf4148b1 938f77504b Author: Martin Desruisseaux AuthorDate: Tue Apr 9 11:16:12 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. .../sis/buildtools/coding/ReorganizeImports.java | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 1 + .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++- .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++--- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 --- .../apache/sis/referencing/IdentifiedObjects.java | 54 +- .../org/apache/sis/referencing/Properties.java | 7 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 +++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 21 ++--- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 37 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 --- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 26 +-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 + geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 ++ .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++ 59 files changed, 390 insertions(+), 207 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 1b9ca46297,b882cec7f4..798c00d7e8 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java @@@ -85,9 -84,13 +84,12 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Errors; import org.apache.sis.util.iso.Types; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.referencing.crs.DefaultImageCRS; -import org.apache.sis.referencing.datum.DefaultImageDatum; +// Specific to the main and geoapi-3.1 branches: +import
(sis) branch geoapi-3.1 updated (72bf4148b1 -> abe39d4ffc)
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 72bf4148b1 Merge automatic import reorganization. add cb2e0de6f8 Fix an import order. add 938f77504b Avoid usage of `getScope()` and `getDomainOfValidity()` methods, which are deprecated in GeoAPI 3.1 and removed in GeoAPI 4.0. They are replaced by `ObjectDomain`. new abe39d4ffc Merge branch 'geoapi-4.0' into geoapi-3.1. This merge avoid deprecated `getScope()` and `getDomainOfValidity()` methods. Those methods are replaced by `getDomains()`. 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 | 1 + .../apache/sis/coverage/grid/GridExtentCRS.java| 9 ++-- .../sis/metadata/iso/extent/DefaultExtent.java | 3 +- .../apache/sis/metadata/iso/extent/Extents.java| 4 ++ .../metadata/simple/SimpleIdentifiedObject.java| 1 + .../referencing/gazetteer/FinalLocationType.java | 9 ++-- .../gazetteer/ModifiableLocationType.java | 2 +- .../gazetteer/ReferencingByIdentifiers.java| 38 ++- .../gazetteer/ReferencingByIdentifiersTest.java| 5 +- .../main/org/apache/sis/io/wkt/ElementKind.java| 50 .../apache/sis/io/wkt/GeodeticObjectParser.java| 8 ++-- .../sis/referencing/AbstractIdentifiedObject.java | 13 +++--- .../main/org/apache/sis/referencing/Builder.java | 4 +- .../main/org/apache/sis/referencing/CRS.java | 26 --- .../apache/sis/referencing/IdentifiedObjects.java | 54 +- .../org/apache/sis/referencing/Properties.java | 7 +-- .../sis/referencing/StandardDefinitions.java | 2 +- .../apache/sis/referencing/crs/AbstractCRS.java| 5 +- .../sis/referencing/crs/DefaultDerivedCRS.java | 4 +- .../sis/referencing/datum/BursaWolfParameters.java | 5 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java| 7 +-- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/AbstractSingleOperation.java | 3 +- .../operation/CoordinateOperationFinder.java | 3 +- .../operation/CoordinateOperationSorter.java | 3 +- .../operation/DefaultConcatenatedOperation.java| 3 +- .../referencing/operation/DefaultConversion.java | 4 +- .../DefaultCoordinateOperationFactory.java | 18 .../operation/DefaultPassThroughOperation.java | 3 +- .../operation/DefaultTransformation.java | 4 +- .../operation/InverseOperationMethod.java | 5 +- .../operation/transform/AbstractMathTransform.java | 2 +- .../operation/transform/DomainDefinition.java | 2 +- .../operation/transform/MathTransforms.java| 2 +- .../privy/EllipsoidalHeightCombiner.java | 11 +++-- .../referencing/privy/GeodeticObjectBuilder.java | 5 +- .../referencing/privy/NilReferencingObject.java| 21 ++--- .../referencing/AbstractReferenceSystemTest.java | 15 -- .../test/org/apache/sis/referencing/CRSTest.java | 5 +- .../sis/referencing/GeodeticObjectVerifier.java| 37 ++- .../referencing/crs/DefaultGeodeticCRSTest.java| 3 +- .../referencing/crs/DefaultProjectedCRSTest.java | 3 +- .../apache/sis/referencing/crs/HardCodedCRS.java | 4 +- .../datum/DefaultGeodeticDatumTest.java| 12 +++-- .../datum/DefaultTemporalDatumTest.java| 16 --- .../datum/DefaultVerticalDatumTest.java| 5 +- .../sis/referencing/datum/HardCodedDatum.java | 26 +-- .../operation/SingleOperationMarshallingTest.java | 12 +++-- .../apache/sis/test/integration/MetadataTest.java | 3 +- .../sis/test/integration/MetadataVerticalTest.java | 5 +- .../apache/sis/storage/base/MetadataBuilder.java | 5 +- .../main/org/apache/sis/util/ComparisonMode.java | 4 +- .../org/apache/sis/util/LenientComparable.java | 3 +- .../test/org/apache/sis/test/TestUtilities.java| 32 + geoapi/snapshot| 2 +- .../org/apache/sis/gui/referencing/CRSChooser.java | 24 ++ .../gui/referencing/RecentReferenceSystems.java| 2 +- .../main/org/apache/sis/gui/referencing/Utils.java | 24 ++ 59 files changed, 390 insertions(+), 207 deletions(-)
